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

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

Issue 1373023002: RTCCertificate, RTCPeerConnection.generateCertificate (WebRTC JavaScript) added. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make trybots compile (WebRTCCertificate not including wtf/Noncopyable) Created 5 years, 2 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
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_blink_platform_impl.h" 5 #include "content/renderer/renderer_blink_platform_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/location.h" 10 #include "base/location.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "content/renderer/cache_storage/webserviceworkercachestorage_impl.h" 51 #include "content/renderer/cache_storage/webserviceworkercachestorage_impl.h"
52 #include "content/renderer/device_sensors/device_light_event_pump.h" 52 #include "content/renderer/device_sensors/device_light_event_pump.h"
53 #include "content/renderer/device_sensors/device_motion_event_pump.h" 53 #include "content/renderer/device_sensors/device_motion_event_pump.h"
54 #include "content/renderer/device_sensors/device_orientation_event_pump.h" 54 #include "content/renderer/device_sensors/device_orientation_event_pump.h"
55 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" 55 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
56 #include "content/renderer/gamepad_shared_memory_reader.h" 56 #include "content/renderer/gamepad_shared_memory_reader.h"
57 #include "content/renderer/media/audio_decoder.h" 57 #include "content/renderer/media/audio_decoder.h"
58 #include "content/renderer/media/media_recorder_handler.h" 58 #include "content/renderer/media/media_recorder_handler.h"
59 #include "content/renderer/media/renderer_webaudiodevice_impl.h" 59 #include "content/renderer/media/renderer_webaudiodevice_impl.h"
60 #include "content/renderer/media/renderer_webmidiaccessor_impl.h" 60 #include "content/renderer/media/renderer_webmidiaccessor_impl.h"
61 #include "content/renderer/media/rtc_certificate_generator.h"
61 #include "content/renderer/render_thread_impl.h" 62 #include "content/renderer/render_thread_impl.h"
62 #include "content/renderer/renderer_clipboard_delegate.h" 63 #include "content/renderer/renderer_clipboard_delegate.h"
63 #include "content/renderer/screen_orientation/screen_orientation_observer.h" 64 #include "content/renderer/screen_orientation/screen_orientation_observer.h"
64 #include "content/renderer/webclipboard_impl.h" 65 #include "content/renderer/webclipboard_impl.h"
65 #include "content/renderer/webgraphicscontext3d_provider_impl.h" 66 #include "content/renderer/webgraphicscontext3d_provider_impl.h"
66 #include "content/renderer/webpublicsuffixlist_impl.h" 67 #include "content/renderer/webpublicsuffixlist_impl.h"
67 #include "gpu/config/gpu_info.h" 68 #include "gpu/config/gpu_info.h"
68 #include "ipc/ipc_sync_message_filter.h" 69 #include "ipc/ipc_sync_message_filter.h"
69 #include "media/audio/audio_output_device.h" 70 #include "media/audio/audio_output_device.h"
70 #include "media/base/audio_hardware_config.h" 71 #include "media/base/audio_hardware_config.h"
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 PeerConnectionDependencyFactory* rtc_dependency_factory = 906 PeerConnectionDependencyFactory* rtc_dependency_factory =
906 render_thread->GetPeerConnectionDependencyFactory(); 907 render_thread->GetPeerConnectionDependencyFactory();
907 return rtc_dependency_factory->CreateRTCPeerConnectionHandler(client); 908 return rtc_dependency_factory->CreateRTCPeerConnectionHandler(client);
908 #else 909 #else
909 return NULL; 910 return NULL;
910 #endif // defined(ENABLE_WEBRTC) 911 #endif // defined(ENABLE_WEBRTC)
911 } 912 }
912 913
913 //------------------------------------------------------------------------------ 914 //------------------------------------------------------------------------------
914 915
916 blink::WebRTCCertificateGenerator*
917 RendererBlinkPlatformImpl::createRTCCertificateGenerator() {
918 #if defined(ENABLE_WEBRTC)
919 return new RTCCertificateGenerator();
920 #else
921 return NULL;
Ryan Sleevi 2015/10/10 04:04:48 https://chromium-cpp.appspot.com/ says nullptr?
hbos_chromium 2015/10/14 13:00:50 Updated all places in file as to use nullptr consi
922 #endif // defined(ENABLE_WEBRTC)
923 }
924
925 //------------------------------------------------------------------------------
926
915 WebMediaStreamCenter* RendererBlinkPlatformImpl::createMediaStreamCenter( 927 WebMediaStreamCenter* RendererBlinkPlatformImpl::createMediaStreamCenter(
916 WebMediaStreamCenterClient* client) { 928 WebMediaStreamCenterClient* client) {
917 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 929 RenderThreadImpl* render_thread = RenderThreadImpl::current();
918 DCHECK(render_thread); 930 DCHECK(render_thread);
919 if (!render_thread) 931 if (!render_thread)
920 return NULL; 932 return NULL;
921 return render_thread->CreateMediaStreamCenter(client); 933 return render_thread->CreateMediaStreamCenter(client);
922 } 934 }
923 935
924 // static 936 // static
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 //------------------------------------------------------------------------------ 1258 //------------------------------------------------------------------------------
1247 1259
1248 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting( 1260 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting(
1249 const blink::WebBatteryStatus& status) { 1261 const blink::WebBatteryStatus& status) {
1250 if (!g_test_battery_status_listener) 1262 if (!g_test_battery_status_listener)
1251 return; 1263 return;
1252 g_test_battery_status_listener->updateBatteryStatus(status); 1264 g_test_battery_status_listener->updateBatteryStatus(status);
1253 } 1265 }
1254 1266
1255 } // namespace content 1267 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698