third_party/WebKit/Source/modules/bluetooth/BluetoothGATTRemoteServer.cpp - Issue 1527853002: bluetooth: Add disconnect function

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/BluetoothGATTRemoteServer.cpp

Issue 1527853002: bluetooth: Add disconnect function (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-device-identifier

Patch Set: Fix test that fails after upstream change. Created 4 years, 11 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/Source/modules/bluetooth/BluetoothGATTRemoteServer.h ('k') | third_party/WebKit/Source/modules/bluetooth/BluetoothGATTRemoteServer.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/bluetooth/BluetoothGATTRemoteServer.cpp

diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothGATTRemoteServer.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothGATTRemoteServer.cpp

index ed091b8aa92f0ba9e1bc624ed5cfb615efddbb70..862d903186b11a82d6c2120023a66aad0d3e2c91 100644

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

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

@@ -29,6 +29,13 @@ BluetoothGATTRemoteServer* BluetoothGATTRemoteServer::take(ScriptPromiseResolver

return new BluetoothGATTRemoteServer(webGATT);

}

+void BluetoothGATTRemoteServer::disconnect(ScriptState* scriptState)

+ m_webGATT->connected = false;

+ WebBluetooth* webbluetooth = BluetoothSupplement::fromScriptState(scriptState);

+ webbluetooth->disconnect(m_webGATT->deviceId);

ScriptPromise BluetoothGATTRemoteServer::getPrimaryService(ScriptState* scriptState, const StringOrUnsignedLong& service, ExceptionState& exceptionState)

{

WebBluetooth* webbluetooth = BluetoothSupplement::fromScriptState(scriptState);

@@ -39,7 +46,7 @@ ScriptPromise BluetoothGATTRemoteServer::getPrimaryService(ScriptState* scriptSt

ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);

ScriptPromise promise = resolver->promise();

- webbluetooth->getPrimaryService(m_webGATT->deviceInstanceID, serviceUUID, new CallbackPromiseAdapter<BluetoothGATTService, BluetoothError>(resolver));

+ webbluetooth->getPrimaryService(m_webGATT->deviceId, serviceUUID, new CallbackPromiseAdapter<BluetoothGATTService, BluetoothError>(resolver));

return promise;

}