Index: content/renderer/bluetooth/bluetooth_dispatcher.h |
diff --git a/content/renderer/bluetooth/bluetooth_dispatcher.h b/content/renderer/bluetooth/bluetooth_dispatcher.h |
index ff6a0751539641e8c1216166a942145675492a7c..0315c153adc7d36c8ff3a545bd00e42c56ead3fa 100644 |
--- a/content/renderer/bluetooth/bluetooth_dispatcher.h |
+++ b/content/renderer/bluetooth/bluetooth_dispatcher.h |
@@ -61,32 +61,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); |
@@ -110,6 +119,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, |
@@ -154,6 +164,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. |