Index: third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom |
diff --git a/third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom b/third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom |
index b53f4d84d386ca27fc1e6635247393f6b6c350c0..2e01472ad9259689afa9ba12047017d279f7d621 100644 |
--- a/third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom |
+++ b/third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom |
@@ -5,6 +5,7 @@ |
module blink.mojom; |
import "device/bluetooth/public/interfaces/bluetooth_uuid.mojom"; |
+import "content/common/bluetooth/bluetooth_device_id.mojom"; |
// Errors that can occur during Web Bluetooth execution, which are transformed |
// to a DOMException in Source/modules/bluetooth/BluetoothError.cpp. |
@@ -89,7 +90,7 @@ enum WebBluetoothGATTQueryQuantity { |
}; |
struct WebBluetoothDevice { |
- string id; |
+ content.mojom.BluetoothDeviceId id; |
string name; |
array<string> uuids; |
}; |
@@ -123,16 +124,16 @@ interface WebBluetoothService { |
// connection to the device didn't exist already. If a GATT connection existed |
// already then this function increases the ref count to keep that connection |
// alive. |
- RemoteServerConnect(string device_id) => (WebBluetoothError error); |
+ RemoteServerConnect(content.mojom.BluetoothDeviceId device_id) => (WebBluetoothError error); |
Jeffrey Yasskin
2016/06/03 17:22:05
I wish we had 'using' declarations in mojo.
ortuno
2016/06/06 22:23:00
Me too :(
|
// If a GATT connection exists for Device with |device_id| then decreases |
// the ref count for that connection. |
- RemoteServerDisconnect(string device_id); |
+ RemoteServerDisconnect(content.mojom.BluetoothDeviceId device_id); |
// Returns the first GATT Service with |service_uuid| of a Bluetooth Device |
// with |device_id|. |
RemoteServerGetPrimaryService( |
- string device_id, |
+ content.mojom.BluetoothDeviceId device_id, |
device.mojom.BluetoothUUID service_uuid) => ( |
WebBluetoothError error, |
WebBluetoothRemoteGATTService? service); |
@@ -182,5 +183,5 @@ interface WebBluetoothService { |
interface WebBluetoothServiceClient { |
RemoteCharacteristicValueChanged(string characteristic_instance_id, |
array<uint8> value); |
- GattServerDisconnected(string device_id); |
+ GattServerDisconnected(content.mojom.BluetoothDeviceId device_id); |
}; |