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

Unified Diff: third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp

Issue 1858293002: bluetooth: Enable Web Bluetooth on experimental framework (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Created 4 years, 8 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: third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp
diff --git a/third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp b/third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp
index c2b6821537d7b84f95cfba878f9e3ee1ae9b80ea..989bbe1bf1b70486b61db6e607650ce3d02076c4 100644
--- a/third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp
+++ b/third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp
@@ -129,15 +129,12 @@ static void convertRequestDeviceOptions(const RequestDeviceOptions& options, Web
// https://webbluetoothchrome.github.io/web-bluetooth/#dom-bluetooth-requestdevice
ScriptPromise Bluetooth::requestDevice(ScriptState* scriptState, const RequestDeviceOptions& options, ExceptionState& exceptionState)
{
- // TODO(https://crbug.com/584113) Enable Web Bluetooth Experiment.
- // Restore this logic when re-enabling the experiment:
- //
// By adding the "OriginTrialEnabled" extended binding, we enable the
// requestDevice function on all platforms for whitelisted domains. Since we
// only support Chrome OS and Android for this experiment we reject any
// promises from other platforms unless they have the enable-web-bluetooth
// flag on.
-#if 0 // !OS(CHROMEOS) && !OS(ANDROID)
+#if !OS(CHROMEOS) && !OS(ANDROID)
if (!RuntimeEnabledFeatures::webBluetoothEnabled()) {
return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError, "Web Bluetooth is not enabled on this platform. To find out how to enable it and the current implementation status visit https://goo.gl/HKa2If"));
}

Powered by Google App Engine
This is Rietveld 408576698