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

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

Issue 1866403004: WIP Enable WebUSB through the Experimental Framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix usage of [OriginTrialEnabled] Created 4 years, 8 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 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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "content/common/page_messages.h" 56 #include "content/common/page_messages.h"
57 #include "content/common/savable_subframe.h" 57 #include "content/common/savable_subframe.h"
58 #include "content/common/service_worker/service_worker_types.h" 58 #include "content/common/service_worker/service_worker_types.h"
59 #include "content/common/site_isolation_policy.h" 59 #include "content/common/site_isolation_policy.h"
60 #include "content/common/ssl_status_serialization.h" 60 #include "content/common/ssl_status_serialization.h"
61 #include "content/common/swapped_out_messages.h" 61 #include "content/common/swapped_out_messages.h"
62 #include "content/common/view_messages.h" 62 #include "content/common/view_messages.h"
63 #include "content/public/common/bindings_policy.h" 63 #include "content/public/common/bindings_policy.h"
64 #include "content/public/common/browser_side_navigation_policy.h" 64 #include "content/public/common/browser_side_navigation_policy.h"
65 #include "content/public/common/content_constants.h" 65 #include "content/public/common/content_constants.h"
66 #include "content/public/common/content_features.h"
66 #include "content/public/common/content_switches.h" 67 #include "content/public/common/content_switches.h"
67 #include "content/public/common/context_menu_params.h" 68 #include "content/public/common/context_menu_params.h"
68 #include "content/public/common/isolated_world_ids.h" 69 #include "content/public/common/isolated_world_ids.h"
69 #include "content/public/common/page_state.h" 70 #include "content/public/common/page_state.h"
70 #include "content/public/common/resource_response.h" 71 #include "content/public/common/resource_response.h"
71 #include "content/public/common/url_constants.h" 72 #include "content/public/common/url_constants.h"
72 #include "content/public/common/url_utils.h" 73 #include "content/public/common/url_utils.h"
73 #include "content/public/renderer/browser_plugin_delegate.h" 74 #include "content/public/renderer/browser_plugin_delegate.h"
74 #include "content/public/renderer/content_renderer_client.h" 75 #include "content/public/renderer/content_renderer_client.h"
75 #include "content/public/renderer/context_menu_client.h" 76 #include "content/public/renderer/context_menu_client.h"
(...skipping 4204 matching lines...) Expand 10 before | Expand all | Expand 10 after
4280 if (!bluetooth_ && ChildThreadImpl::current()) { 4281 if (!bluetooth_ && ChildThreadImpl::current()) {
4281 bluetooth_.reset(new WebBluetoothImpl( 4282 bluetooth_.reset(new WebBluetoothImpl(
4282 GetServiceRegistry(), ChildThreadImpl::current()->thread_safe_sender(), 4283 GetServiceRegistry(), ChildThreadImpl::current()->thread_safe_sender(),
4283 routing_id_)); 4284 routing_id_));
4284 } 4285 }
4285 4286
4286 return bluetooth_.get(); 4287 return bluetooth_.get();
4287 } 4288 }
4288 4289
4289 blink::WebUSBClient* RenderFrameImpl::usbClient() { 4290 blink::WebUSBClient* RenderFrameImpl::usbClient() {
4291 if (!base::FeatureList::IsEnabled(features::kWebUsb))
4292 return nullptr;
4293
4290 if (!usb_client_) 4294 if (!usb_client_)
4291 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry())); 4295 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry()));
4292 4296
4293 return usb_client_.get(); 4297 return usb_client_.get();
4294 } 4298 }
4295 4299
4296 #if defined(ENABLE_WEBVR) 4300 #if defined(ENABLE_WEBVR)
4297 blink::WebVRClient* RenderFrameImpl::webVRClient() { 4301 blink::WebVRClient* RenderFrameImpl::webVRClient() {
4298 if (!vr_dispatcher_) 4302 if (!vr_dispatcher_)
4299 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry())); 4303 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry()));
(...skipping 1724 matching lines...) Expand 10 before | Expand all | Expand 10 after
6024 int match_count, 6028 int match_count,
6025 int ordinal, 6029 int ordinal,
6026 const WebRect& selection_rect, 6030 const WebRect& selection_rect,
6027 bool final_status_update) { 6031 bool final_status_update) {
6028 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6032 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6029 selection_rect, ordinal, 6033 selection_rect, ordinal,
6030 final_status_update)); 6034 final_status_update));
6031 } 6035 }
6032 6036
6033 } // namespace content 6037 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698