| Index: content/renderer/bluetooth/bluetooth_dispatcher.h
|
| diff --git a/content/renderer/bluetooth/bluetooth_dispatcher.h b/content/renderer/bluetooth/bluetooth_dispatcher.h
|
| index 6dbd5ea93578e43c1efcf631b4fed5f1906b64bf..1d978e12ed4bbe72be5de361605c66eadeffbd4f 100644
|
| --- a/content/renderer/bluetooth/bluetooth_dispatcher.h
|
| +++ b/content/renderer/bluetooth/bluetooth_dispatcher.h
|
| @@ -64,32 +64,41 @@ class BluetoothDispatcher : public WorkerThread::Observer {
|
| void requestDevice(int frame_routing_id,
|
| const blink::WebRequestDeviceOptions& options,
|
| blink::WebBluetoothRequestDeviceCallbacks* callbacks);
|
| - void connectGATT(const blink::WebString& device_id,
|
| + void connectGATT(int frame_routing_id,
|
| + const blink::WebString& device_id,
|
| blink::WebBluetoothConnectGATTCallbacks* callbacks);
|
| void getPrimaryService(
|
| + int frame_routing_id,
|
| const blink::WebString& device_id,
|
| const blink::WebString& service_uuid,
|
| blink::WebBluetoothGetPrimaryServiceCallbacks* callbacks);
|
|
|
| void getCharacteristic(
|
| + int frame_routing_id,
|
| const blink::WebString& service_instance_id,
|
| const blink::WebString& characteristic_uuid,
|
| blink::WebBluetoothGetCharacteristicCallbacks* callbacks);
|
| - void readValue(const blink::WebString& characteristic_instance_id,
|
| + void readValue(int frame_routing_id,
|
| + const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothReadValueCallbacks* callbacks);
|
| - void writeValue(const blink::WebString& characteristic_instance_id,
|
| + void writeValue(int frame_routing_id,
|
| + const blink::WebString& characteristic_instance_id,
|
| const blink::WebVector<uint8_t>& value,
|
| blink::WebBluetoothWriteValueCallbacks*);
|
| - void startNotifications(const blink::WebString& characteristic_instance_id,
|
| + void startNotifications(int frame_routing_id,
|
| + const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothGATTCharacteristic* delegate,
|
| blink::WebBluetoothNotificationsCallbacks*);
|
| - void stopNotifications(const blink::WebString& characteristic_instance_id,
|
| + void stopNotifications(int frame_routing_id,
|
| + const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothGATTCharacteristic* delegate,
|
| blink::WebBluetoothNotificationsCallbacks*);
|
| void characteristicObjectRemoved(
|
| + int frame_routing_id,
|
| const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothGATTCharacteristic* delegate);
|
| void registerCharacteristicObject(
|
| + int frame_routing_id,
|
| const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothGATTCharacteristic* characteristic);
|
|
|
| @@ -113,6 +122,7 @@ class BluetoothDispatcher : public WorkerThread::Observer {
|
|
|
| // Creates a notification request and queues it.
|
| int QueueNotificationRequest(
|
| + int frame_routing_id,
|
| const std::string& characteristic_instance_id,
|
| blink::WebBluetoothGATTCharacteristic* characteristic,
|
| blink::WebBluetoothNotificationsCallbacks* callbacks,
|
| @@ -157,6 +167,7 @@ class BluetoothDispatcher : public WorkerThread::Observer {
|
| // receiving notifications.
|
| // https://crbug.com/541388
|
| void UnregisterCharacteristicObject(
|
| + int frame_routing_id,
|
| const blink::WebString& characteristic_instance_id);
|
|
|
| // IPC Handlers, see definitions in bluetooth_messages.h.
|
|
|