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

Side by Side Diff: content/renderer/renderer_webkitplatformsupport_impl.cc

Issue 272043003: Renamed MediaStreamDependencyFactory to PeerConnectionDependencyFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 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
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer_webkitplatformsupport_impl.h" 5 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/memory/shared_memory.h" 10 #include "base/memory/shared_memory.h"
(...skipping 26 matching lines...) Expand all
37 #include "content/public/common/content_switches.h" 37 #include "content/public/common/content_switches.h"
38 #include "content/public/common/webplugininfo.h" 38 #include "content/public/common/webplugininfo.h"
39 #include "content/public/renderer/content_renderer_client.h" 39 #include "content/public/renderer/content_renderer_client.h"
40 #include "content/renderer/battery_status/battery_status_dispatcher.h" 40 #include "content/renderer/battery_status/battery_status_dispatcher.h"
41 #include "content/renderer/device_sensors/device_motion_event_pump.h" 41 #include "content/renderer/device_sensors/device_motion_event_pump.h"
42 #include "content/renderer/device_sensors/device_orientation_event_pump.h" 42 #include "content/renderer/device_sensors/device_orientation_event_pump.h"
43 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" 43 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
44 #include "content/renderer/gamepad_shared_memory_reader.h" 44 #include "content/renderer/gamepad_shared_memory_reader.h"
45 #include "content/renderer/media/audio_decoder.h" 45 #include "content/renderer/media/audio_decoder.h"
46 #include "content/renderer/media/crypto/key_systems.h" 46 #include "content/renderer/media/crypto/key_systems.h"
47 #include "content/renderer/media/media_stream_dependency_factory.h"
48 #include "content/renderer/media/renderer_webaudiodevice_impl.h" 47 #include "content/renderer/media/renderer_webaudiodevice_impl.h"
49 #include "content/renderer/media/renderer_webmidiaccessor_impl.h" 48 #include "content/renderer/media/renderer_webmidiaccessor_impl.h"
50 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" 49 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
50 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
51 #include "content/renderer/render_thread_impl.h" 51 #include "content/renderer/render_thread_impl.h"
52 #include "content/renderer/renderer_clipboard_client.h" 52 #include "content/renderer/renderer_clipboard_client.h"
53 #include "content/renderer/screen_orientation/mock_screen_orientation_controller .h" 53 #include "content/renderer/screen_orientation/mock_screen_orientation_controller .h"
54 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 54 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
55 #include "content/renderer/webclipboard_impl.h" 55 #include "content/renderer/webclipboard_impl.h"
56 #include "content/renderer/webgraphicscontext3d_provider_impl.h" 56 #include "content/renderer/webgraphicscontext3d_provider_impl.h"
57 #include "content/renderer/webpublicsuffixlist_impl.h" 57 #include "content/renderer/webpublicsuffixlist_impl.h"
58 #include "gpu/config/gpu_info.h" 58 #include "gpu/config/gpu_info.h"
59 #include "ipc/ipc_sync_message_filter.h" 59 #include "ipc/ipc_sync_message_filter.h"
60 #include "media/audio/audio_output_device.h" 60 #include "media/audio/audio_output_device.h"
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
914 if (!render_thread) 914 if (!render_thread)
915 return NULL; 915 return NULL;
916 916
917 #if defined(ENABLE_WEBRTC) 917 #if defined(ENABLE_WEBRTC)
918 WebRTCPeerConnectionHandler* peer_connection_handler = 918 WebRTCPeerConnectionHandler* peer_connection_handler =
919 GetContentClient()->renderer()->OverrideCreateWebRTCPeerConnectionHandler( 919 GetContentClient()->renderer()->OverrideCreateWebRTCPeerConnectionHandler(
920 client); 920 client);
921 if (peer_connection_handler) 921 if (peer_connection_handler)
922 return peer_connection_handler; 922 return peer_connection_handler;
923 923
924 MediaStreamDependencyFactory* rtc_dependency_factory = 924 PeerConnectionDependencyFactory* rtc_dependency_factory =
925 render_thread->GetMediaStreamDependencyFactory(); 925 render_thread->GetPeerConnectionDependencyFactory();
926 return rtc_dependency_factory->CreateRTCPeerConnectionHandler(client); 926 return rtc_dependency_factory->CreateRTCPeerConnectionHandler(client);
927 #else 927 #else
928 return NULL; 928 return NULL;
929 #endif // defined(ENABLE_WEBRTC) 929 #endif // defined(ENABLE_WEBRTC)
930 } 930 }
931 931
932 //------------------------------------------------------------------------------ 932 //------------------------------------------------------------------------------
933 933
934 WebMediaStreamCenter* 934 WebMediaStreamCenter*
935 RendererWebKitPlatformSupportImpl::createMediaStreamCenter( 935 RendererWebKitPlatformSupportImpl::createMediaStreamCenter(
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 void RendererWebKitPlatformSupportImpl::setBatteryStatusListener( 1200 void RendererWebKitPlatformSupportImpl::setBatteryStatusListener(
1201 blink::WebBatteryStatusListener* listener) { 1201 blink::WebBatteryStatusListener* listener) {
1202 if (!battery_status_dispatcher_) { 1202 if (!battery_status_dispatcher_) {
1203 battery_status_dispatcher_.reset( 1203 battery_status_dispatcher_.reset(
1204 new BatteryStatusDispatcher(RenderThreadImpl::current())); 1204 new BatteryStatusDispatcher(RenderThreadImpl::current()));
1205 } 1205 }
1206 battery_status_dispatcher_->SetListener(listener); 1206 battery_status_dispatcher_->SetListener(listener);
1207 } 1207 }
1208 1208
1209 } // namespace content 1209 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698