| Index: talk/app/webrtc/peerconnection.h
|
| diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h
|
| index c47f90372e3e9d0586cf045e90731b5516989a22..ddcb05819f46c3d5fe0e53a4c8fecc30f9ec8d93 100644
|
| --- a/talk/app/webrtc/peerconnection.h
|
| +++ b/talk/app/webrtc/peerconnection.h
|
| @@ -77,12 +77,22 @@ class PeerConnection : public PeerConnectionInterface,
|
| public:
|
| explicit PeerConnection(PeerConnectionFactory* factory);
|
|
|
| + // TODO(deadbeef): Remove this overload of Initialize once everyone is moved
|
| + // to the new version.
|
| bool Initialize(
|
| const PeerConnectionInterface::RTCConfiguration& configuration,
|
| const MediaConstraintsInterface* constraints,
|
| PortAllocatorFactoryInterface* allocator_factory,
|
| rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
|
| PeerConnectionObserver* observer);
|
| +
|
| + bool Initialize(
|
| + const PeerConnectionInterface::RTCConfiguration& configuration,
|
| + const MediaConstraintsInterface* constraints,
|
| + rtc::scoped_ptr<cricket::PortAllocator> allocator,
|
| + rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
|
| + PeerConnectionObserver* observer);
|
| +
|
| rtc::scoped_refptr<StreamCollectionInterface> local_streams() override;
|
| rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override;
|
| bool AddStream(MediaStreamInterface* local_stream) override;
|
|
|