Index: content/child/bluetooth/bluetooth_dispatcher.h |
diff --git a/content/child/bluetooth/bluetooth_dispatcher.h b/content/child/bluetooth/bluetooth_dispatcher.h |
index 4bd4f250257e666a045ab51eca9a4baa528d6cd4..55d8ca78c7646eedf6fac93a973e9c5e3ec7f7fc 100644 |
--- a/content/child/bluetooth/bluetooth_dispatcher.h |
+++ b/content/child/bluetooth/bluetooth_dispatcher.h |
@@ -50,6 +50,10 @@ class BluetoothDispatcher : public WorkerTaskRunner::Observer { |
void requestDevice(blink::WebBluetoothRequestDeviceCallbacks* callbacks); |
void connectGATT(const blink::WebString& device_instance_id, |
blink::WebBluetoothConnectGATTCallbacks* callbacks); |
+ void getPrimaryService( |
+ const blink::WebString& device_instance_id, |
+ const blink::WebString& service_uuid, |
+ blink::WebBluetoothGetPrimaryServiceCallbacks* callbacks); |
// WorkerTaskRunner::Observer implementation. |
void OnWorkerRunLoopStopped() override; |
@@ -71,6 +75,16 @@ class BluetoothDispatcher : public WorkerTaskRunner::Observer { |
int request_id, |
BluetoothError error_type); |
+ void OnGetPrimaryServiceSuccess(int thread_id, |
scheib
2015/05/28 23:09:16
Remove blank lines between all of these, they're a
ortuno
2015/05/29 17:53:55
Removed the ones this patch introduces. I will rem
|
+ int request_id, |
+ const std::string& device_instance_id, |
+ const std::string& service_instance_id, |
+ const std::string& service_uuid); |
+ |
+ void OnGetPrimaryServiceError(int thread_id, |
+ int request_id, |
+ BluetoothError error_type); |
+ |
scoped_refptr<ThreadSafeSender> thread_safe_sender_; |
// Tracks device requests sent to browser to match replies with callbacks. |
@@ -81,6 +95,10 @@ class BluetoothDispatcher : public WorkerTaskRunner::Observer { |
// Owns callback objects. |
IDMap<blink::WebBluetoothConnectGATTCallbacks, IDMapOwnPointer> |
pending_connect_requests_; |
+ // Tracks requests to get a primary service from a device. |
+ // Owns callback objects. |
+ IDMap<blink::WebBluetoothGetPrimaryServiceCallbacks, IDMapOwnPointer> |
+ pending_primary_service_requests_; |
DISALLOW_COPY_AND_ASSIGN(BluetoothDispatcher); |
}; |