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

Unified Diff: content/child/runtime_features.cc

Issue 2437943002: Ship WebBluetooth out of origin trial (Closed)
Patch Set: fixed layout tests on Linux and Windows 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..4f7ee4de9321a752e9085f1ed5fd1045365809b3 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -69,8 +69,11 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
WebRuntimeFeatures::enableFeaturePolicy(
base::FeatureList::IsEnabled(features::kFeaturePolicy));
- if (command_line.HasSwitch(switches::kEnableWebBluetooth))
- WebRuntimeFeatures::enableWebBluetooth(true);
+ bool enable_web_bluetooth = enableExperimentalWebPlatformFeatures;
scheib 2016/10/21 01:02:10 Let's explain this with // Web Bluetooth is shipp
juncai 2016/10/21 16:57:54 Done.
+#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