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

Side by Side Diff: Source/modules/bluetooth/BluetoothDevice.cpp

Issue 1228283003: Attach a WebBluetooth to the LocalFrame and use it if it's available. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@error-enum-cleanup
Patch Set: Always use BluetoothSupplement to get the WebBluetooth instance. Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « Source/modules/bluetooth/Bluetooth.cpp ('k') | Source/modules/bluetooth/BluetoothError.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/bluetooth/BluetoothDevice.h" 6 #include "modules/bluetooth/BluetoothDevice.h"
7 7
8 #include "bindings/core/v8/CallbackPromiseAdapter.h" 8 #include "bindings/core/v8/CallbackPromiseAdapter.h"
9 #include "bindings/core/v8/ScriptPromise.h" 9 #include "bindings/core/v8/ScriptPromise.h"
10 #include "bindings/core/v8/ScriptPromiseResolver.h" 10 #include "bindings/core/v8/ScriptPromiseResolver.h"
11 #include "core/dom/DOMException.h" 11 #include "core/dom/DOMException.h"
12 #include "core/dom/ExceptionCode.h" 12 #include "core/dom/ExceptionCode.h"
13 #include "modules/bluetooth/BluetoothError.h" 13 #include "modules/bluetooth/BluetoothError.h"
14 #include "modules/bluetooth/BluetoothGATTRemoteServer.h" 14 #include "modules/bluetooth/BluetoothGATTRemoteServer.h"
15 #include "public/platform/Platform.h" 15 #include "modules/bluetooth/BluetoothSupplement.h"
16 #include "public/platform/modules/bluetooth/WebBluetooth.h" 16 #include "public/platform/modules/bluetooth/WebBluetooth.h"
17 17
18 namespace blink { 18 namespace blink {
19 19
20 BluetoothDevice::BluetoothDevice(PassOwnPtr<WebBluetoothDevice> webDevice) 20 BluetoothDevice::BluetoothDevice(PassOwnPtr<WebBluetoothDevice> webDevice)
21 : m_webDevice(webDevice) 21 : m_webDevice(webDevice)
22 { 22 {
23 } 23 }
24 24
25 BluetoothDevice* BluetoothDevice::take(ScriptPromiseResolver*, PassOwnPtr<WebBlu etoothDevice> webDevice) 25 BluetoothDevice* BluetoothDevice::take(ScriptPromiseResolver*, PassOwnPtr<WebBlu etoothDevice> webDevice)
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 Vector<String> BluetoothDevice::uuids() 70 Vector<String> BluetoothDevice::uuids()
71 { 71 {
72 Vector<String> uuids(m_webDevice->uuids.size()); 72 Vector<String> uuids(m_webDevice->uuids.size());
73 for (size_t i = 0; i < m_webDevice->uuids.size(); ++i) 73 for (size_t i = 0; i < m_webDevice->uuids.size(); ++i)
74 uuids[i] = m_webDevice->uuids[i]; 74 uuids[i] = m_webDevice->uuids[i];
75 return uuids; 75 return uuids;
76 } 76 }
77 77
78 ScriptPromise BluetoothDevice::connectGATT(ScriptState* scriptState) 78 ScriptPromise BluetoothDevice::connectGATT(ScriptState* scriptState)
79 { 79 {
80 WebBluetooth* webbluetooth = Platform::current()->bluetooth(); 80 WebBluetooth* webbluetooth = BluetoothSupplement::from(scriptState);
81 if (!webbluetooth) 81 if (!webbluetooth)
82 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(NotSupportedError)); 82 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(NotSupportedError));
83 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState); 83 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState);
84 ScriptPromise promise = resolver->promise(); 84 ScriptPromise promise = resolver->promise();
85 webbluetooth->connectGATT(instanceID(), new CallbackPromiseAdapter<Bluetooth GATTRemoteServer, BluetoothError>(resolver)); 85 webbluetooth->connectGATT(instanceID(), new CallbackPromiseAdapter<Bluetooth GATTRemoteServer, BluetoothError>(resolver));
86 return promise; 86 return promise;
87 } 87 }
88 88
89 } // namespace blink 89 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/bluetooth/Bluetooth.cpp ('k') | Source/modules/bluetooth/BluetoothError.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698