Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Unified Diff: talk/app/webrtc/peerconnectioninterface.h

Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: webrtcsession_unittest cleanup Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: talk/app/webrtc/peerconnectioninterface.h
diff --git a/talk/app/webrtc/peerconnectioninterface.h b/talk/app/webrtc/peerconnectioninterface.h
index ce32b50291a7a46c061bf36aabe9d7cf8d9096b2..5063f4029147281f9dedb9f276feafb95c881252 100644
--- a/talk/app/webrtc/peerconnectioninterface.h
+++ b/talk/app/webrtc/peerconnectioninterface.h
@@ -72,6 +72,7 @@
#include <vector>
#include "talk/app/webrtc/datachannelinterface.h"
+#include "talk/app/webrtc/dtlscertificate.h"
#include "talk/app/webrtc/dtmfsenderinterface.h"
#include "talk/app/webrtc/jsep.h"
#include "talk/app/webrtc/mediastreaminterface.h"
@@ -548,7 +549,22 @@ class PeerConnectionFactoryInterface : public rtc::RefCountInterface {
virtual void SetOptions(const Options& options) = 0;
+ // TODO(hbos): Remove default implementation when all child classes use this
+ // new function signature.
Henrik Grunell WebRTC 2015/08/05 07:41:20 Can that be done right away? If not, when is that
hbos 2015/08/06 12:11:34 Removing this function and the the blocking identi
Henrik Grunell WebRTC 2015/08/06 14:06:52 Acknowledged.
+ virtual rtc::scoped_refptr<PeerConnectionInterface>
+ CreatePeerConnection(
+ const PeerConnectionInterface::RTCConfiguration& configuration,
+ const MediaConstraintsInterface* constraints,
+ PortAllocatorFactoryInterface* allocator_factory,
+ rtc::scoped_refptr<DtlsCertificate> certificate,
+ PeerConnectionObserver* observer) {
+ return nullptr;
+ }
+
// This method takes the ownership of |dtls_identity_service|.
+ // --- Deprecated. ---
+ // TODO(hbos): Remove this function signature in favor of the one taking
+ // DtlsCertificate input.
virtual rtc::scoped_refptr<PeerConnectionInterface>
CreatePeerConnection(
const PeerConnectionInterface::RTCConfiguration& configuration,

Powered by Google App Engine
This is Rietveld 408576698