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

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

Issue 1403723004: bluetooth: Implement BluetoothCharacteristicProperties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-query-cache
Patch Set: Address scheib's comments Created 5 years, 2 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/bluetooth_dispatcher.cc
diff --git a/content/renderer/bluetooth/bluetooth_dispatcher.cc b/content/renderer/bluetooth/bluetooth_dispatcher.cc
index daa4e5dad5a0752434d1e53c435faf613bd54160..7a1c7d5ad4e82e56c5c79b2fb4caef3e56d03ccb 100644
--- a/content/renderer/bluetooth/bluetooth_dispatcher.cc
+++ b/content/renderer/bluetooth/bluetooth_dispatcher.cc
@@ -611,7 +611,8 @@ void BluetoothDispatcher::OnGetPrimaryServiceError(int thread_id,
void BluetoothDispatcher::OnGetCharacteristicSuccess(
int thread_id,
int request_id,
- const std::string& characteristic_instance_id) {
+ const std::string& characteristic_instance_id,
+ uint32 characteristic_properties) {
DCHECK(pending_characteristic_requests_.Lookup(request_id)) << request_id;
BluetoothCharacteristicRequest* request =
@@ -619,7 +620,8 @@ void BluetoothDispatcher::OnGetCharacteristicSuccess(
request->callbacks->onSuccess(
blink::adoptWebPtr(new WebBluetoothGATTCharacteristicInit(
WebString::fromUTF8(characteristic_instance_id),
- request->service_instance_id, request->characteristic_uuid)));
+ request->service_instance_id, request->characteristic_uuid,
+ characteristic_properties)));
pending_characteristic_requests_.Remove(request_id);
}

Powered by Google App Engine
This is Rietveld 408576698