chrome/browser/chrome_content_browser_client.cc - Issue 1917103004: Move WebUSB from OriginTrialEnabled to RuntimeEnabled.

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: chrome/browser/chrome_content_browser_client.cc

Issue 1917103004: Move WebUSB from OriginTrialEnabled to RuntimeEnabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: correct content/public/common/content_features.h 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_browser_main.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: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index 9bd60b90ca886b87469ed21dcf24a24ace4a3586..1246431278cd7ced8fa2359f071f3d87c374a4eb 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -2773,7 +2773,11 @@ void ChromeContentBrowserClient::RegisterFrameMojoShellServices(

void ChromeContentBrowserClient::RegisterRenderFrameMojoServices(

content::ServiceRegistry* registry,

content::RenderFrameHost* render_frame_host) {

- if (base::FeatureList::IsEnabled(features::kWebUsb)) {

+ // WebUSB is an experimental web API. It will only work if the experiment

+ // is enabled and WebUSB feature is enabled.

+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kEnableExperimentalWebPlatformFeatures) &&

+ base::FeatureList::IsEnabled(features::kWebUsb)) {

registry->AddService(

base::Bind(&CreateUsbDeviceManager, render_frame_host));

registry->AddService(