| Index: content/renderer/bluetooth/web_bluetooth_impl.cc
|
| diff --git a/content/renderer/bluetooth/web_bluetooth_impl.cc b/content/renderer/bluetooth/web_bluetooth_impl.cc
|
| index 92d035b694b82a660820500b6979e7236aba9bbd..8e3039d66cd23fee9194bf635efdf443b5fe521b 100644
|
| --- a/content/renderer/bluetooth/web_bluetooth_impl.cc
|
| +++ b/content/renderer/bluetooth/web_bluetooth_impl.cc
|
| @@ -30,65 +30,68 @@ void WebBluetoothImpl::requestDevice(
|
| void WebBluetoothImpl::connectGATT(
|
| const blink::WebString& device_id,
|
| blink::WebBluetoothConnectGATTCallbacks* callbacks) {
|
| - GetDispatcher()->connectGATT(device_id, callbacks);
|
| + GetDispatcher()->connectGATT(frame_routing_id_, device_id, callbacks);
|
| }
|
|
|
| void WebBluetoothImpl::getPrimaryService(
|
| const blink::WebString& device_id,
|
| const blink::WebString& service_uuid,
|
| blink::WebBluetoothGetPrimaryServiceCallbacks* callbacks) {
|
| - GetDispatcher()->getPrimaryService(device_id, service_uuid, callbacks);
|
| + GetDispatcher()->getPrimaryService(frame_routing_id_, device_id, service_uuid,
|
| + callbacks);
|
| }
|
|
|
| void WebBluetoothImpl::getCharacteristic(
|
| const blink::WebString& service_instance_id,
|
| const blink::WebString& characteristic_uuid,
|
| blink::WebBluetoothGetCharacteristicCallbacks* callbacks) {
|
| - GetDispatcher()->getCharacteristic(service_instance_id, characteristic_uuid,
|
| - callbacks);
|
| + GetDispatcher()->getCharacteristic(frame_routing_id_, service_instance_id,
|
| + characteristic_uuid, callbacks);
|
| }
|
|
|
| void WebBluetoothImpl::readValue(
|
| const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothReadValueCallbacks* callbacks) {
|
| - GetDispatcher()->readValue(characteristic_instance_id, callbacks);
|
| + GetDispatcher()->readValue(frame_routing_id_, characteristic_instance_id,
|
| + callbacks);
|
| }
|
|
|
| void WebBluetoothImpl::writeValue(
|
| const blink::WebString& characteristic_instance_id,
|
| const blink::WebVector<uint8_t>& value,
|
| blink::WebBluetoothWriteValueCallbacks* callbacks) {
|
| - GetDispatcher()->writeValue(characteristic_instance_id, value, callbacks);
|
| + GetDispatcher()->writeValue(frame_routing_id_, characteristic_instance_id,
|
| + value, callbacks);
|
| }
|
|
|
| void WebBluetoothImpl::startNotifications(
|
| const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothGATTCharacteristic* characteristic,
|
| blink::WebBluetoothNotificationsCallbacks* callbacks) {
|
| - GetDispatcher()->startNotifications(characteristic_instance_id,
|
| - characteristic, callbacks);
|
| + GetDispatcher()->startNotifications(
|
| + frame_routing_id_, characteristic_instance_id, characteristic, callbacks);
|
| }
|
|
|
| void WebBluetoothImpl::stopNotifications(
|
| const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothGATTCharacteristic* characteristic,
|
| blink::WebBluetoothNotificationsCallbacks* callbacks) {
|
| - GetDispatcher()->stopNotifications(characteristic_instance_id, characteristic,
|
| - callbacks);
|
| + GetDispatcher()->stopNotifications(
|
| + frame_routing_id_, characteristic_instance_id, characteristic, callbacks);
|
| }
|
|
|
| void WebBluetoothImpl::characteristicObjectRemoved(
|
| const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothGATTCharacteristic* characteristic) {
|
| - GetDispatcher()->characteristicObjectRemoved(characteristic_instance_id,
|
| - characteristic);
|
| + GetDispatcher()->characteristicObjectRemoved(
|
| + frame_routing_id_, characteristic_instance_id, characteristic);
|
| }
|
|
|
| void WebBluetoothImpl::registerCharacteristicObject(
|
| const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothGATTCharacteristic* characteristic) {
|
| - GetDispatcher()->registerCharacteristicObject(characteristic_instance_id,
|
| - characteristic);
|
| + GetDispatcher()->registerCharacteristicObject(
|
| + frame_routing_id_, characteristic_instance_id, characteristic);
|
| }
|
|
|
| BluetoothDispatcher* WebBluetoothImpl::GetDispatcher() {
|
|
|