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

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: media_stream_dependency_factory_unittest.cc 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
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/common/view_messages.h" 37 #include "content/common/view_messages.h"
38 #include "content/public/common/content_switches.h" 38 #include "content/public/common/content_switches.h"
39 #include "content/public/common/webplugininfo.h" 39 #include "content/public/common/webplugininfo.h"
40 #include "content/public/renderer/content_renderer_client.h" 40 #include "content/public/renderer/content_renderer_client.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/screen_orientation_dispatcher.h" 53 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
54 #include "content/renderer/webclipboard_impl.h" 54 #include "content/renderer/webclipboard_impl.h"
55 #include "content/renderer/webgraphicscontext3d_provider_impl.h" 55 #include "content/renderer/webgraphicscontext3d_provider_impl.h"
56 #include "content/renderer/webpublicsuffixlist_impl.h" 56 #include "content/renderer/webpublicsuffixlist_impl.h"
57 #include "gpu/config/gpu_info.h" 57 #include "gpu/config/gpu_info.h"
58 #include "ipc/ipc_sync_message_filter.h" 58 #include "ipc/ipc_sync_message_filter.h"
59 #include "media/audio/audio_output_device.h" 59 #include "media/audio/audio_output_device.h"
60 #include "media/base/audio_hardware_config.h" 60 #include "media/base/audio_hardware_config.h"
(...skipping 847 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 if (!render_thread) 908 if (!render_thread)
909 return NULL; 909 return NULL;
910 910
911 #if defined(ENABLE_WEBRTC) 911 #if defined(ENABLE_WEBRTC)
912 WebRTCPeerConnectionHandler* peer_connection_handler = 912 WebRTCPeerConnectionHandler* peer_connection_handler =
913 GetContentClient()->renderer()->OverrideCreateWebRTCPeerConnectionHandler( 913 GetContentClient()->renderer()->OverrideCreateWebRTCPeerConnectionHandler(
914 client); 914 client);
915 if (peer_connection_handler) 915 if (peer_connection_handler)
916 return peer_connection_handler; 916 return peer_connection_handler;
917 917
918 MediaStreamDependencyFactory* rtc_dependency_factory = 918 PeerConnectionDependencyFactory* rtc_dependency_factory =
919 render_thread->GetMediaStreamDependencyFactory(); 919 render_thread->GetPeerConnectionDependencyFactory();
920 return rtc_dependency_factory->CreateRTCPeerConnectionHandler(client); 920 return rtc_dependency_factory->CreateRTCPeerConnectionHandler(client);
921 #else 921 #else
922 return NULL; 922 return NULL;
923 #endif // defined(ENABLE_WEBRTC) 923 #endif // defined(ENABLE_WEBRTC)
924 } 924 }
925 925
926 //------------------------------------------------------------------------------ 926 //------------------------------------------------------------------------------
927 927
928 WebMediaStreamCenter* 928 WebMediaStreamCenter*
929 RendererWebKitPlatformSupportImpl::createMediaStreamCenter( 929 RendererWebKitPlatformSupportImpl::createMediaStreamCenter(
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
1176 return; 1176 return;
1177 QuotaDispatcher::ThreadSpecificInstance( 1177 QuotaDispatcher::ThreadSpecificInstance(
1178 thread_safe_sender_.get(), 1178 thread_safe_sender_.get(),
1179 quota_message_filter_.get())->QueryStorageUsageAndQuota( 1179 quota_message_filter_.get())->QueryStorageUsageAndQuota(
1180 storage_partition, 1180 storage_partition,
1181 static_cast<quota::StorageType>(type), 1181 static_cast<quota::StorageType>(type),
1182 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks)); 1182 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks));
1183 } 1183 }
1184 1184
1185 } // namespace content 1185 } // namespace content
OLDNEW
« content/renderer/media/rtc_peer_connection_handler.cc ('K') | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698