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

Unified Diff: third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom

Issue 2015463004: bluetooth: Use BluetoothUUID instead of string when sending uuids (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-mojo-request-device
Patch Set: Fix merge conflict Created 4 years, 6 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
« no previous file with comments | « third_party/WebKit/public/blink.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d89f5a3915fe6c4a6dce512fe529aeb526102f83..b53f4d84d386ca27fc1e6635247393f6b6c350c0 100644
--- a/third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom
+++ b/third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom
@@ -4,6 +4,8 @@
module blink.mojom;
+import "device/bluetooth/public/interfaces/bluetooth_uuid.mojom";
+
// Errors that can occur during Web Bluetooth execution, which are transformed
// to a DOMException in Source/modules/bluetooth/BluetoothError.cpp.
//
@@ -69,14 +71,14 @@ enum WebBluetoothError {
};
struct WebBluetoothScanFilter {
- array<string>? services;
+ array<device.mojom.BluetoothUUID>? services;
string? name;
string? name_prefix;
};
struct WebBluetoothRequestDeviceOptions {
array<WebBluetoothScanFilter> filters;
- array<string> optional_services;
+ array<device.mojom.BluetoothUUID> optional_services;
};
// Indicates if the function will return a single or multiple
@@ -131,7 +133,7 @@ interface WebBluetoothService {
// with |device_id|.
RemoteServerGetPrimaryService(
string device_id,
- string service_uuid) => (
+ device.mojom.BluetoothUUID service_uuid) => (
WebBluetoothError error,
WebBluetoothRemoteGATTService? service);
@@ -141,7 +143,7 @@ interface WebBluetoothService {
RemoteServiceGetCharacteristics(
string service_instance_id,
WebBluetoothGATTQueryQuantity quantity,
- string? characteristics_uuid) => (
+ device.mojom.BluetoothUUID? characteristics_uuid) => (
WebBluetoothError error,
array<WebBluetoothRemoteGATTCharacteristic>? characteristics);
« no previous file with comments | « third_party/WebKit/public/blink.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698