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

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

Issue 10382003: Changes needed to roll libjingle r141 (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 7 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"
11 #include "content/renderer/media/webrtc_audio_device_impl.h" 11 #include "content/renderer/media/webrtc_audio_device_impl.h"
12 #include "content/renderer/p2p/ipc_network_manager.h" 12 #include "content/renderer/p2p/ipc_network_manager.h"
13 #include "content/renderer/p2p/ipc_socket_factory.h" 13 #include "content/renderer/p2p/ipc_socket_factory.h"
14 #include "content/renderer/p2p/port_allocator.h" 14 #include "content/renderer/p2p/port_allocator.h"
15 #include "jingle/glue/thread_wrapper.h" 15 #include "jingle/glue/thread_wrapper.h"
16 #include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h"
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
18 17
19 class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface { 18 class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface {
20 public: 19 public:
21 P2PPortAllocatorFactory( 20 P2PPortAllocatorFactory(
22 content::P2PSocketDispatcher* socket_dispatcher, 21 content::P2PSocketDispatcher* socket_dispatcher,
23 talk_base::NetworkManager* network_manager, 22 talk_base::NetworkManager* network_manager,
24 talk_base::PacketSocketFactory* socket_factory) 23 talk_base::PacketSocketFactory* socket_factory)
25 : socket_dispatcher_(socket_dispatcher), 24 : socket_dispatcher_(socket_dispatcher),
26 network_manager_(network_manager), 25 network_manager_(network_manager),
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 webrtc::SessionDescriptionInterface* 149 webrtc::SessionDescriptionInterface*
151 MediaStreamDependencyFactory::CreateSessionDescription(const std::string& sdp) { 150 MediaStreamDependencyFactory::CreateSessionDescription(const std::string& sdp) {
152 return webrtc::CreateSessionDescription(sdp); 151 return webrtc::CreateSessionDescription(sdp);
153 } 152 }
154 153
155 webrtc::IceCandidateInterface* MediaStreamDependencyFactory::CreateIceCandidate( 154 webrtc::IceCandidateInterface* MediaStreamDependencyFactory::CreateIceCandidate(
156 const std::string& label, 155 const std::string& label,
157 const std::string& sdp) { 156 const std::string& sdp) {
158 return webrtc::CreateIceCandidate(label, sdp); 157 return webrtc::CreateIceCandidate(label, sdp);
159 } 158 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698