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

Unified Diff: content/renderer/bluetooth/web_bluetooth_impl.h

Issue 1922923002: bluetooth: Move requestDevice to mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-separate-tests-request-device
Patch Set: Change ref to pointer Created 4 years, 7 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: content/renderer/bluetooth/web_bluetooth_impl.h
diff --git a/content/renderer/bluetooth/web_bluetooth_impl.h b/content/renderer/bluetooth/web_bluetooth_impl.h
index fae4ad485ee28a85710b1c6266d444a54161a059..1f1fd9529f84e0722dda61024e3930a564d77863 100644
--- a/content/renderer/bluetooth/web_bluetooth_impl.h
+++ b/content/renderer/bluetooth/web_bluetooth_impl.h
@@ -37,9 +37,7 @@ class CONTENT_EXPORT WebBluetoothImpl
: NON_EXPORTED_BASE(public blink::mojom::WebBluetoothServiceClient),
NON_EXPORTED_BASE(public blink::WebBluetooth) {
public:
- WebBluetoothImpl(ServiceRegistry* service_registry,
- ThreadSafeSender* thread_safe_sender,
- int frame_routing_id);
+ WebBluetoothImpl(ServiceRegistry* service_registry);
~WebBluetoothImpl() override;
// blink::WebBluetooth interface:
@@ -87,6 +85,10 @@ class CONTENT_EXPORT WebBluetoothImpl
void GattServerDisconnected(const mojo::String& device_id) override;
// Callbacks for WebBluetoothService calls:
+ void OnRequestDeviceComplete(
+ std::unique_ptr<blink::WebBluetoothRequestDeviceCallbacks> callbacks,
+ const blink::mojom::WebBluetoothError error,
+ blink::mojom::WebBluetoothDevicePtr device);
void OnConnectComplete(
std::unique_ptr<blink::WebBluetoothRemoteGATTServerConnectCallbacks>
callbacks,
@@ -120,8 +122,6 @@ class CONTENT_EXPORT WebBluetoothImpl
const std::string& characteristic_instance_id,
const std::vector<uint8_t>& value);
- BluetoothDispatcher* GetDispatcher();
-
blink::mojom::WebBluetoothService& GetWebBluetoothService();
ServiceRegistry* const service_registry_;
blink::mojom::WebBluetoothServicePtr web_bluetooth_service_;
@@ -142,9 +142,6 @@ class CONTENT_EXPORT WebBluetoothImpl
// Binding associated with |web_bluetooth_service_|.
mojo::AssociatedBinding<blink::mojom::WebBluetoothServiceClient> binding_;
- const scoped_refptr<ThreadSafeSender> thread_safe_sender_;
- const int frame_routing_id_;
-
DISALLOW_COPY_AND_ASSIGN(WebBluetoothImpl);
};
« no previous file with comments | « content/renderer/bluetooth/bluetooth_type_converters.cc ('k') | content/renderer/bluetooth/web_bluetooth_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698