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

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

Issue 1861013005: bluetooth: Move GetCharacteristic(s) over to Mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-separate-tests-read-value
Patch Set: Address palmer's comments Created 4 years, 8 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.h
diff --git a/content/renderer/bluetooth/web_bluetooth_impl.h b/content/renderer/bluetooth/web_bluetooth_impl.h
index 789cbcb0f9739f74b0b4d08fed2e77ae114b1105..a49525363ebc388db42cbc819e05f12767acf11e 100644
--- a/content/renderer/bluetooth/web_bluetooth_impl.h
+++ b/content/renderer/bluetooth/web_bluetooth_impl.h
@@ -54,12 +54,9 @@ class CONTENT_EXPORT WebBluetoothImpl
const blink::WebString& device_id,
const blink::WebString& service_uuid,
blink::WebBluetoothGetPrimaryServiceCallbacks* callbacks) override;
- void getCharacteristic(
- const blink::WebString& service_instance_id,
- const blink::WebString& characteristic_uuid,
- blink::WebBluetoothGetCharacteristicCallbacks* callbacks) override;
void getCharacteristics(
const blink::WebString& service_instance_id,
+ blink::mojom::WebBluetoothGATTQueryQuantity quantity,
const blink::WebString& characteristics_uuid,
blink::WebBluetoothGetCharacteristicsCallbacks* callbacks) override;
void readValue(const blink::WebString& characteristic_instance_id,
@@ -81,12 +78,19 @@ class CONTENT_EXPORT WebBluetoothImpl
blink::WebBluetoothRemoteGATTCharacteristic* characteristic) override;
private:
+ struct GetCharacteristicsCallback;
// WebBluetoothServiceClient methods:
void RemoteCharacteristicValueChanged(
const mojo::String& characteristic_instance_id,
mojo::Array<uint8_t> value) override;
// Callbacks for WebBluetoothService calls:
+ void OnGetCharacteristicsComplete(
+ const blink::WebString& service_instance_id,
+ std::unique_ptr<blink::WebBluetoothGetCharacteristicsCallbacks> callbacks,
+ blink::mojom::WebBluetoothError error,
+ mojo::Array<blink::mojom::WebBluetoothRemoteGATTCharacteristicPtr>
+ characteristics);
void OnReadValueComplete(
std::unique_ptr<blink::WebBluetoothReadValueCallbacks> callbacks,
blink::mojom::WebBluetoothError error,
« no previous file with comments | « content/renderer/bluetooth/bluetooth_dispatcher.cc ('k') | content/renderer/bluetooth/web_bluetooth_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698