Chromium Code Reviews| Index: talk/app/webrtc/peerconnectionfactory.h |
| diff --git a/talk/app/webrtc/peerconnectionfactory.h b/talk/app/webrtc/peerconnectionfactory.h |
| index c5855f452b76cc4be2be35d3e6e7c91c5d0d2ef6..1cbd3db63d3b7e290d623e95f0cdedb9540b80e8 100644 |
| --- a/talk/app/webrtc/peerconnectionfactory.h |
| +++ b/talk/app/webrtc/peerconnectionfactory.h |
| @@ -50,7 +50,7 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
| } |
| // webrtc::PeerConnectionFactoryInterface override; |
| - rtc::scoped_refptr<PeerConnectionInterface> |
| + virtual rtc::scoped_refptr<PeerConnectionInterface> |
|
Henrik Grunell WebRTC
2015/08/12 14:46:29
Remove virtual, it's implied from override.
hbos
2015/08/14 14:09:39
Done.
|
| CreatePeerConnection( |
| const PeerConnectionInterface::RTCConfiguration& configuration, |
| const MediaConstraintsInterface* constraints, |
| @@ -58,6 +58,14 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
| rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, |
| PeerConnectionObserver* observer) override; |
| + virtual rtc::scoped_refptr<PeerConnectionInterface> |
| + CreatePeerConnection( |
| + const PeerConnectionInterface::RTCConfiguration& configuration, |
| + const MediaConstraintsInterface* constraints, |
| + PortAllocatorFactoryInterface* allocator_factory, |
| + const rtc::scoped_refptr<DtlsCertificate>& certificate, |
| + PeerConnectionObserver* observer) override; |
| + |
| bool Initialize(); |
| rtc::scoped_refptr<MediaStreamInterface> |
| @@ -96,6 +104,8 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
| virtual ~PeerConnectionFactory(); |
| private: |
| + PortAllocatorFactoryInterface* CreatePeerConnectionCommon( |
|
Henrik Grunell WebRTC
2015/08/12 14:46:29
Nit: I think ...Internal() is a slightly better na
hbos
2015/08/14 14:09:39
Acknowledged.
|
| + PortAllocatorFactoryInterface* allocator_factory); |
| cricket::MediaEngineInterface* CreateMediaEngine_w(); |
| bool owns_ptrs_; |