Index: content/child/runtime_features.cc |
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc |
index 1cf707331344d6d379e07ed5bb288c204df23b0b..e3484077199fc97155f4758f192189c68ea47240 100644 |
--- a/content/child/runtime_features.cc |
+++ b/content/child/runtime_features.cc |
@@ -68,8 +68,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) |
Rick Byers
2016/10/27 20:37:54
please move this into SetRuntimeFeatureDefaultsFor
juncai
2016/10/27 21:54:26
Done.
|
+ enable_web_bluetooth = true; |
+#endif |
+ WebRuntimeFeatures::enableWebBluetooth(enable_web_bluetooth); |
if (!base::FeatureList::IsEnabled(features::kWebUsb)) |
WebRuntimeFeatures::enableWebUsb(false); |