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

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

Issue 1493183002: Enable WebUSB on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix GYP build. Created 5 years 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
« no previous file with comments | « content/renderer/BUILD.gn ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 #include "content/renderer/render_thread_impl.h" 109 #include "content/renderer/render_thread_impl.h"
110 #include "content/renderer/render_view_impl.h" 110 #include "content/renderer/render_view_impl.h"
111 #include "content/renderer/render_widget_fullscreen_pepper.h" 111 #include "content/renderer/render_widget_fullscreen_pepper.h"
112 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 112 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
113 #include "content/renderer/renderer_webcolorchooser_impl.h" 113 #include "content/renderer/renderer_webcolorchooser_impl.h"
114 #include "content/renderer/savable_resources.h" 114 #include "content/renderer/savable_resources.h"
115 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 115 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
116 #include "content/renderer/shared_worker_repository.h" 116 #include "content/renderer/shared_worker_repository.h"
117 #include "content/renderer/skia_benchmarking_extension.h" 117 #include "content/renderer/skia_benchmarking_extension.h"
118 #include "content/renderer/stats_collection_controller.h" 118 #include "content/renderer/stats_collection_controller.h"
119 #include "content/renderer/usb/web_usb_client_impl.h"
119 #include "content/renderer/wake_lock/wake_lock_dispatcher.h" 120 #include "content/renderer/wake_lock/wake_lock_dispatcher.h"
120 #include "content/renderer/web_frame_utils.h" 121 #include "content/renderer/web_frame_utils.h"
121 #include "content/renderer/web_ui_extension.h" 122 #include "content/renderer/web_ui_extension.h"
122 #include "content/renderer/websharedworker_proxy.h" 123 #include "content/renderer/websharedworker_proxy.h"
123 #include "gin/modules/module_registry.h" 124 #include "gin/modules/module_registry.h"
124 #include "media/audio/audio_output_device.h" 125 #include "media/audio/audio_output_device.h"
125 #include "media/base/audio_renderer_mixer_input.h" 126 #include "media/base/audio_renderer_mixer_input.h"
126 #include "media/base/media_log.h" 127 #include "media/base/media_log.h"
127 #include "media/base/media_switches.h" 128 #include "media/base/media_switches.h"
128 #include "media/blink/webencryptedmediaclient_impl.h" 129 #include "media/blink/webencryptedmediaclient_impl.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 #include "content/common/gpu/client/context_provider_command_buffer.h" 184 #include "content/common/gpu/client/context_provider_command_buffer.h"
184 #include "content/renderer/android/synchronous_compositor_factory.h" 185 #include "content/renderer/android/synchronous_compositor_factory.h"
185 #include "content/renderer/java/gin_java_bridge_dispatcher.h" 186 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
186 #include "content/renderer/media/android/renderer_media_player_manager.h" 187 #include "content/renderer/media/android/renderer_media_player_manager.h"
187 #include "content/renderer/media/android/renderer_media_session_manager.h" 188 #include "content/renderer/media/android/renderer_media_session_manager.h"
188 #include "content/renderer/media/android/stream_texture_factory_impl.h" 189 #include "content/renderer/media/android/stream_texture_factory_impl.h"
189 #include "content/renderer/media/android/webmediaplayer_android.h" 190 #include "content/renderer/media/android/webmediaplayer_android.h"
190 #include "content/renderer/media/android/webmediasession_android.h" 191 #include "content/renderer/media/android/webmediasession_android.h"
191 #else 192 #else
192 #include "cc/blink/context_provider_web_context.h" 193 #include "cc/blink/context_provider_web_context.h"
193 #include "content/renderer/usb/web_usb_client_impl.h"
194 #include "device/devices_app/public/cpp/constants.h" 194 #include "device/devices_app/public/cpp/constants.h"
195 #endif 195 #endif
196 196
197 #if defined(ENABLE_PEPPER_CDMS) 197 #if defined(ENABLE_PEPPER_CDMS)
198 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h" 198 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"
199 #elif defined(ENABLE_BROWSER_CDMS) 199 #elif defined(ENABLE_BROWSER_CDMS)
200 #include "content/renderer/media/cdm/renderer_cdm_manager.h" 200 #include "content/renderer/media/cdm/renderer_cdm_manager.h"
201 #endif 201 #endif
202 202
203 #if defined(ENABLE_MOJO_MEDIA) 203 #if defined(ENABLE_MOJO_MEDIA)
(...skipping 3819 matching lines...) Expand 10 before | Expand all | Expand 10 after
4023 blink::WebBluetooth* RenderFrameImpl::bluetooth() { 4023 blink::WebBluetooth* RenderFrameImpl::bluetooth() {
4024 if (!bluetooth_) { 4024 if (!bluetooth_) {
4025 bluetooth_.reset(new WebBluetoothImpl( 4025 bluetooth_.reset(new WebBluetoothImpl(
4026 ChildThreadImpl::current()->thread_safe_sender(), routing_id_)); 4026 ChildThreadImpl::current()->thread_safe_sender(), routing_id_));
4027 } 4027 }
4028 4028
4029 return bluetooth_.get(); 4029 return bluetooth_.get();
4030 } 4030 }
4031 4031
4032 blink::WebUSBClient* RenderFrameImpl::usbClient() { 4032 blink::WebUSBClient* RenderFrameImpl::usbClient() {
4033 #if !defined(OS_ANDROID) 4033 if (!usb_client_)
4034 if (!usb_client_) {
4035 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry())); 4034 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry()));
4036 } 4035
4037 #endif
4038 return usb_client_.get(); 4036 return usb_client_.get();
4039 } 4037 }
4040 4038
4041 #if defined(ENABLE_WEBVR) 4039 #if defined(ENABLE_WEBVR)
4042 blink::WebVRClient* RenderFrameImpl::webVRClient() { 4040 blink::WebVRClient* RenderFrameImpl::webVRClient() {
4043 if (!vr_dispatcher_) 4041 if (!vr_dispatcher_)
4044 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry())); 4042 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry()));
4045 4043
4046 return vr_dispatcher_.get(); 4044 return vr_dispatcher_.get();
4047 } 4045 }
(...skipping 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after
5444 media::ConvertToSwitchOutputDeviceCB(web_callbacks); 5442 media::ConvertToSwitchOutputDeviceCB(web_callbacks);
5445 scoped_refptr<media::AudioOutputDevice> device = 5443 scoped_refptr<media::AudioOutputDevice> device =
5446 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), 5444 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(),
5447 security_origin); 5445 security_origin);
5448 media::OutputDeviceStatus status = device->GetDeviceStatus(); 5446 media::OutputDeviceStatus status = device->GetDeviceStatus();
5449 device->Stop(); 5447 device->Stop();
5450 callback.Run(status); 5448 callback.Run(status);
5451 } 5449 }
5452 5450
5453 } // namespace content 5451 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698