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

Side by Side Diff: content/renderer/media/media_stream_dependency_factory.cc

Issue 10804004: Remove the deprecated PeerConnection that uses the ROAP protocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed trailing whitespace in webrtc.py Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_stream_dependency_factory.h" 5 #include "content/renderer/media/media_stream_dependency_factory.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "content/renderer/media/video_capture_impl_manager.h" 9 #include "content/renderer/media/video_capture_impl_manager.h"
10 #include "content/renderer/media/video_capture_module_impl.h" 10 #include "content/renderer/media/video_capture_module_impl.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 return pc_factory_.get() != NULL; 106 return pc_factory_.get() != NULL;
107 } 107 }
108 108
109 talk_base::scoped_refptr<webrtc::PeerConnectionInterface> 109 talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
110 MediaStreamDependencyFactory::CreatePeerConnection( 110 MediaStreamDependencyFactory::CreatePeerConnection(
111 const std::string& config, 111 const std::string& config,
112 webrtc::PeerConnectionObserver* observer) { 112 webrtc::PeerConnectionObserver* observer) {
113 return pc_factory_->CreatePeerConnection(config, observer); 113 return pc_factory_->CreatePeerConnection(config, observer);
114 } 114 }
115 115
116 talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
117 MediaStreamDependencyFactory::CreateRoapPeerConnection(
118 const std::string& config,
119 webrtc::PeerConnectionObserver* observer) {
120 return pc_factory_->CreateRoapPeerConnection(config, observer);
121 }
122
123 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> 116 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
124 MediaStreamDependencyFactory::CreateLocalMediaStream( 117 MediaStreamDependencyFactory::CreateLocalMediaStream(
125 const std::string& label) { 118 const std::string& label) {
126 return pc_factory_->CreateLocalMediaStream(label); 119 return pc_factory_->CreateLocalMediaStream(label);
127 } 120 }
128 121
129 talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface> 122 talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface>
130 MediaStreamDependencyFactory::CreateLocalVideoTrack( 123 MediaStreamDependencyFactory::CreateLocalVideoTrack(
131 const std::string& label, 124 const std::string& label,
132 int video_session_id) { 125 int video_session_id) {
(...skipping 16 matching lines...) Expand all
149 webrtc::SessionDescriptionInterface* 142 webrtc::SessionDescriptionInterface*
150 MediaStreamDependencyFactory::CreateSessionDescription(const std::string& sdp) { 143 MediaStreamDependencyFactory::CreateSessionDescription(const std::string& sdp) {
151 return webrtc::CreateSessionDescription(sdp); 144 return webrtc::CreateSessionDescription(sdp);
152 } 145 }
153 146
154 webrtc::IceCandidateInterface* MediaStreamDependencyFactory::CreateIceCandidate( 147 webrtc::IceCandidateInterface* MediaStreamDependencyFactory::CreateIceCandidate(
155 const std::string& label, 148 const std::string& label,
156 const std::string& sdp) { 149 const std::string& sdp) {
157 return webrtc::CreateIceCandidate(label, sdp); 150 return webrtc::CreateIceCandidate(label, sdp);
158 } 151 }
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_dependency_factory.h ('k') | content/renderer/media/media_stream_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698