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

Unified Diff: chrome/browser/about_flags.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 9715feeea9ca3bfcc845098c11905fd82d68c512..7e3b631ab82688230f1a7733f27ab766c874c0d2 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1983,15 +1983,13 @@ const FeatureEntry kFeatureEntries[] = {
ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePushApiBackgroundMode,
switches::kDisablePushApiBackgroundMode)},
#endif // defined(ENABLE_BACKGROUND)
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
- // TODO(reillyg): Remove this flag when the permission granting UI is
- // available. crbug.com/529950
- {"enable-webusb-on-any-origin",
- IDS_FLAGS_ENABLE_WEBUSB_ON_ANY_ORIGIN_NAME,
- IDS_FLAGS_ENABLE_WEBUSB_ON_ANY_ORIGIN_DESCRIPTION,
- kOsDesktop,
- SINGLE_VALUE_TYPE(switches::kEnableWebUsbOnAnyOrigin)},
-#endif
+ // TODO(reillyg): Remove this flag when the permission granting UI is
+ // available. crbug.com/529950
+ {"enable-webusb-on-any-origin",
+ IDS_FLAGS_ENABLE_WEBUSB_ON_ANY_ORIGIN_NAME,
+ IDS_FLAGS_ENABLE_WEBUSB_ON_ANY_ORIGIN_DESCRIPTION,
+ kOsAll,
+ SINGLE_VALUE_TYPE(switches::kEnableWebUsbOnAnyOrigin)},
#if defined(OS_CHROMEOS)
{"cros-regions-mode",
IDS_FLAGS_CROS_REGIONS_MODE_NAME,
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698