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

Unified Diff: content/child/runtime_features.cc

Issue 2437943002: Ship WebBluetooth out of origin trial (Closed)
Patch Set: address 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
Index: content/child/runtime_features.cc
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
index 109ab6cc51a64cb24739686bfbefeb8201a50827..a902f5f16ef634a23df09c76f8af8545df7357ad 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -69,8 +69,13 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
WebRuntimeFeatures::enableFeaturePolicy(
base::FeatureList::IsEnabled(features::kFeaturePolicy));
- if (command_line.HasSwitch(switches::kEnableWebBluetooth))
- WebRuntimeFeatures::enableWebBluetooth(true);
+ // Web Bluetooth is shipped on Android, ChromeOS & MacOS, experimental
+ // otherwise.
+ bool enable_web_bluetooth = enableExperimentalWebPlatformFeatures;
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX)
+ enable_web_bluetooth = true;
+#endif
+ WebRuntimeFeatures::enableWebBluetooth(enable_web_bluetooth);
if (!base::FeatureList::IsEnabled(features::kWebUsb))
WebRuntimeFeatures::enableWebUsb(false);

Powered by Google App Engine
This is Rietveld 408576698