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

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

Issue 9174012: Roll libjingle to r108. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 8 years, 11 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 "content/renderer/media/video_capture_module_impl.h" 7 #include "content/renderer/media/video_capture_module_impl.h"
8 #include "content/renderer/media/webrtc_audio_device_impl.h" 8 #include "content/renderer/media/webrtc_audio_device_impl.h"
9 #include "content/renderer/p2p/ipc_network_manager.h" 9 #include "content/renderer/p2p/ipc_network_manager.h"
10 #include "content/renderer/p2p/ipc_socket_factory.h" 10 #include "content/renderer/p2p/ipc_socket_factory.h"
11 #include "content/renderer/p2p/port_allocator.h" 11 #include "content/renderer/p2p/port_allocator.h"
12 #include "jingle/glue/thread_wrapper.h" 12 #include "jingle/glue/thread_wrapper.h"
13 #include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h" 13 #include "third_party/libjingle/source/talk/app/webrtcv1/peerconnection.h"
14 #include "third_party/libjingle/source/talk/session/phone/dummydevicemanager.h" 14 #include "third_party/libjingle/source/talk/session/phone/dummydevicemanager.h"
15 #include "third_party/libjingle/source/talk/session/phone/webrtcmediaengine.h" 15 #include "third_party/libjingle/source/talk/session/phone/webrtcmediaengine.h"
16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
17 17
18 MediaStreamDependencyFactory::MediaStreamDependencyFactory() {} 18 MediaStreamDependencyFactory::MediaStreamDependencyFactory() {}
19 19
20 MediaStreamDependencyFactory::~MediaStreamDependencyFactory() {} 20 MediaStreamDependencyFactory::~MediaStreamDependencyFactory() {}
21 21
22 cricket::WebRtcMediaEngine* 22 cricket::WebRtcMediaEngine*
23 MediaStreamDependencyFactory::CreateWebRtcMediaEngine() { 23 MediaStreamDependencyFactory::CreateWebRtcMediaEngine() {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 network_manager, 63 network_manager,
64 socket_factory, 64 socket_factory,
65 config); 65 config);
66 } 66 }
67 67
68 webrtc::PeerConnection* MediaStreamDependencyFactory::CreatePeerConnection( 68 webrtc::PeerConnection* MediaStreamDependencyFactory::CreatePeerConnection(
69 cricket::PortAllocator* port_allocator, 69 cricket::PortAllocator* port_allocator,
70 talk_base::Thread* signaling_thread) { 70 talk_base::Thread* signaling_thread) {
71 return pc_factory_->CreatePeerConnection(port_allocator, signaling_thread); 71 return pc_factory_->CreatePeerConnection(port_allocator, signaling_thread);
72 } 72 }
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_dependency_factory.h ('k') | content/renderer/media/mock_peer_connection_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698