Chromium Code Reviews| Index: talk/app/webrtc/peerconnection.h |
| diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h |
| index bea9c2f61b610c83129c01f76af2f8f1080b57d2..8ebb8994a3a7476975993091c54a9a297421edd7 100644 |
| --- a/talk/app/webrtc/peerconnection.h |
| +++ b/talk/app/webrtc/peerconnection.h |
| @@ -30,6 +30,7 @@ |
| #include <string> |
| +#include "talk/app/webrtc/dtlsidentitystore.h" |
| #include "talk/app/webrtc/mediastreamsignaling.h" |
| #include "talk/app/webrtc/peerconnectionfactory.h" |
| #include "talk/app/webrtc/peerconnectioninterface.h" |
| @@ -37,6 +38,7 @@ |
| #include "talk/app/webrtc/streamcollection.h" |
| #include "talk/app/webrtc/webrtcsession.h" |
| #include "webrtc/base/scoped_ptr.h" |
| +#include "webrtc/base/sslidentity.h" |
| namespace webrtc { |
| class MediaStreamHandlerContainer; |
| @@ -61,8 +63,9 @@ class PeerConnection : public PeerConnectionInterface, |
| const PeerConnectionInterface::RTCConfiguration& configuration, |
| const MediaConstraintsInterface* constraints, |
| PortAllocatorFactoryInterface* allocator_factory, |
| - DTLSIdentityServiceInterface* dtls_identity_service, |
| - PeerConnectionObserver* observer); |
| + PeerConnectionObserver* observer, |
| + DtlsIdentityStoreInterface* dtls_identity_store, |
| + rtc::KeyType key_type); |
| virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams(); |
| virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams(); |
| virtual bool AddStream(MediaStreamInterface* local_stream); |
| @@ -155,14 +158,6 @@ class PeerConnection : public PeerConnectionInterface, |
| cricket::BaseSession::State state); |
| void ChangeSignalingState(SignalingState signaling_state); |
| - bool DoInitialize(IceTransportsType type, |
| - const StunConfigurations& stun_config, |
| - const TurnConfigurations& turn_config, |
| - const MediaConstraintsInterface* constraints, |
| - PortAllocatorFactoryInterface* allocator_factory, |
| - DTLSIdentityServiceInterface* dtls_identity_service, |
| - PeerConnectionObserver* observer); |
|
hbos
2015/06/12 12:46:55
Declared, not defined. Removing.
|
| - |
| rtc::Thread* signaling_thread() const { |
| return factory_->signaling_thread(); |
| } |