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

Unified Diff: content/child/runtime_features.cc

Issue 2437943002: Ship WebBluetooth out of origin trial (Closed)
Patch Set: address more comments Created 4 years, 2 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 | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/runtime_features.cc
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
index 1cf707331344d6d379e07ed5bb288c204df23b0b..22d31040e38aee135b486e0e9f2e14749f3f63dc 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -53,6 +53,12 @@ static void SetRuntimeFeatureDefaultsForPlatform() {
// Only Android, ChromeOS support NetInfo right now.
WebRuntimeFeatures::enableNetworkInformation(false);
#endif
+
+// Web Bluetooth is shipped on Android, ChromeOS & MacOS, experimental
+// otherwise.
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX)
+ WebRuntimeFeatures::enableWebBluetooth(true);
+#endif
}
void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
@@ -68,9 +74,6 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
WebRuntimeFeatures::enableFeaturePolicy(
base::FeatureList::IsEnabled(features::kFeaturePolicy));
- if (command_line.HasSwitch(switches::kEnableWebBluetooth))
- WebRuntimeFeatures::enableWebBluetooth(true);
-
if (!base::FeatureList::IsEnabled(features::kWebUsb))
WebRuntimeFeatures::enableWebUsb(false);
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698