bluetooth: Enable Web Bluetooth in Origin Trials

third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/bluetooth/Bluetooth.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
@@ skipping 112 matching lines @@
                 return;
             optionalServices.append(validatedOptionalService);
         }
         result.optionalServices.assign(optionalServices);
     }
 }
 
 // https://webbluetoothchrome.github.io/web-bluetooth/#dom-bluetooth-requestdevice
 ScriptPromise Bluetooth::requestDevice(ScriptState* scriptState, const RequestDeviceOptions& options, ExceptionState& exceptionState)
 {
+
+    // By adding the "OriginTrialEnabled" extended binding, we enable the
+    // requestDevice function on all platforms for websites that contain an
+    // origin trial token. Since we only support Chrome OS, Android and macOS

[iclelland, 2016/06/24 18:36:32]

nit: MacOS

[ortuno, 2016/06/24 19:16:33]

I think it's macOS, like in iOS O_O.
https://9to5mac.files.wordpress.com/2016/06/wwdc-2016-watchos-tvos-macos-ios....

[iclelland, 2016/06/24 19:46:35]

Maybe --or Mac OS X, or MacOSX, or just 'OS X' ;)
(Even more authoritatively,
https://web.archive.org/web/20160624143934/https://developer.apple.com/macos/ )

I went for consistency in the codebase -- 702 results at
https://cs.chromium.org/search/?q=MacOS+case:yes&sq=package:chromium&type=cs
versus 3 for
https://cs.chromium.org/search/?q=macOS+case:yes&sq=package:chromium&type=cs

But it's a nit, so I'm really not going to rescind an l g t m over it :)

[ortuno, 2016/06/27 20:22:42]

Ah I guess we are not using the new name yet. I'll change to match the rest of
the codebase.

+    // for this experiment we reject any promises from other platforms unless
+    // they have the enable-web-bluetooth flag on.
+#if !OS(CHROMEOS) && !OS(ANDROID) && !OS(MACOSX)
+    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"));
+    }
+#endif
+
     // 1. If the incumbent settings object is not a secure context, reject promise with a SecurityError and abort these steps.
     String errorMessage;
     if (!scriptState->getExecutionContext()->isSecureContext(errorMessage)) {
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(SecurityError, errorMessage));
     }
 
     // 2. If the algorithm is not allowed to show a popup, reject promise with a SecurityError and abort these steps.
     if (!UserGestureIndicator::consumeUserGesture()) {
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(SecurityError, "Must be handling a user gesture to show a permission request."));
     }
@@ skipping 10 matching lines @@
 
     // Subsequent steps are handled in the browser process.
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     webbluetooth->requestDevice(webOptions, new CallbackPromiseAdapter<BluetoothDevice, BluetoothError>(resolver));
     return promise;
 
 }
 
 } // namespace blink