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

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

Issue 1502663003: bluetooth: Implement allowed devices map (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Fix merge conflicts Created 4 years, 11 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.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() {
« no previous file with comments | « content/renderer/bluetooth/bluetooth_dispatcher.cc ('k') | third_party/WebKit/LayoutTests/bluetooth/idl-BluetoothDevice.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698