content/renderer/render_frame_impl.cc - Issue 1866403004: WIP Enable WebUSB through the Experimental Framework.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_impl.cc

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc

index f40c422299ac9de62cdefd2154974d527c1ffba1..e2420b1efa6b025cf9c353ef4d26fe8337eb0443 100644

--- a/content/renderer/render_frame_impl.cc

+++ b/content/renderer/render_frame_impl.cc

@@ -63,6 +63,7 @@

#include "content/public/common/bindings_policy.h"

#include "content/public/common/browser_side_navigation_policy.h"

#include "content/public/common/content_constants.h"

+#include "content/public/common/content_features.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/context_menu_params.h"

#include "content/public/common/isolated_world_ids.h"

@@ -4287,6 +4288,9 @@ blink::WebBluetooth* RenderFrameImpl::bluetooth() {

}

blink::WebUSBClient* RenderFrameImpl::usbClient() {

+ if (!base::FeatureList::IsEnabled(features::kWebUsb))

+ return nullptr;

if (!usb_client_)

usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry()));