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

Unified Diff: content/browser/bluetooth/web_bluetooth_service_impl.h

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
Index: content/browser/bluetooth/web_bluetooth_service_impl.h
diff --git a/content/browser/bluetooth/web_bluetooth_service_impl.h b/content/browser/bluetooth/web_bluetooth_service_impl.h
index 2034cbbca0ca820b7171c5590f7bb9f0f61cc83e..9940f0f7b7a07b0bf45a609f5719bb4d9ee1e27a 100644
--- a/content/browser/bluetooth/web_bluetooth_service_impl.h
+++ b/content/browser/bluetooth/web_bluetooth_service_impl.h
@@ -10,6 +10,7 @@
#include <vector>
#include "base/macros.h"
+#include "base/optional.h"
#include "content/browser/bad_message.h"
#include "content/browser/bluetooth/bluetooth_allowed_devices_map.h"
#include "content/browser/bluetooth/cache_query_result.h"
@@ -101,12 +102,12 @@ class WebBluetoothServiceImpl : public blink::mojom::WebBluetoothService,
void RemoteServerDisconnect(const mojo::String& device_id) override;
void RemoteServerGetPrimaryService(
const mojo::String& device_id,
- const mojo::String& service_uuid,
+ const base::Optional<device::BluetoothUUID>& service_uuid,
const RemoteServerGetPrimaryServiceCallback& callback) override;
void RemoteServiceGetCharacteristics(
const mojo::String& service_instance_id,
blink::mojom::WebBluetoothGATTQueryQuantity quantity,
- const mojo::String& characteristics_uuid,
+ const base::Optional<device::BluetoothUUID>& characteristics_uuid,
const RemoteServiceGetCharacteristicsCallback& callback) override;
void RemoteCharacteristicReadValue(
const mojo::String& characteristic_instance_id,
@@ -130,7 +131,7 @@ class WebBluetoothServiceImpl : public blink::mojom::WebBluetoothService,
// Should only be run after the services have been discovered for
// |device_address|.
void RemoteServerGetPrimaryServiceImpl(
- const std::string& service_uuid,
+ const base::Optional<device::BluetoothUUID>& service_uuid,
const RemoteServerGetPrimaryServiceCallback& callback,
device::BluetoothDevice* device);
« no previous file with comments | « content/browser/bluetooth/bluetooth_metrics.cc ('k') | content/browser/bluetooth/web_bluetooth_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698