third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp - Issue 1802043002: Remove Web Bluetooth from Experimental in M50.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1802043002: Remove Web Bluetooth from Experimental in M50. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661

Patch Set: Created 4 years, 9 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

« no previous file with comments | « third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt ('k') | third_party/WebKit/Source/modules/bluetooth/Bluetooth.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 6ff6ed2ef786e19b97f177f4b72d209d3b1175c4..c881c4d96fed7e5f2decb0e79885c70e27b255df 100644

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

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

@@ -129,12 +129,15 @@ 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 !OS(CHROMEOS) && !OS(ANDROID)

+#if 0 // !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"));

}