| Index: content/browser/bluetooth/bluetooth_dispatcher_host.h
|
| diff --git a/content/browser/bluetooth/bluetooth_dispatcher_host.h b/content/browser/bluetooth/bluetooth_dispatcher_host.h
|
| index bd21686020a2766de0bc112530f90a71418f08c1..06d8079f0deee170d7f2c38f920f2cccda7fe3eb 100644
|
| --- a/content/browser/bluetooth/bluetooth_dispatcher_host.h
|
| +++ b/content/browser/bluetooth/bluetooth_dispatcher_host.h
|
| @@ -12,8 +12,14 @@
|
| #include "device/bluetooth/bluetooth_adapter.h"
|
| #include "device/bluetooth/bluetooth_gatt_connection.h"
|
|
|
| +namespace device {
|
| +class BluetoothUUID;
|
| +}
|
| +
|
| namespace content {
|
|
|
| +class BluetoothScanFilter;
|
| +
|
| // Dispatches and sends bluetooth related messages sent to/from a child
|
| // process BluetoothDispatcher from/to the main browser process.
|
| //
|
| @@ -45,12 +51,18 @@ class CONTENT_EXPORT BluetoothDispatcherHost final
|
| friend class base::DeleteHelper<BluetoothDispatcherHost>;
|
| friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
|
|
|
| + struct DiscoverySessionOptions;
|
| +
|
| // Set |adapter_| to a BluetoothAdapter instance and register observers,
|
| // releasing references to previous |adapter_|.
|
| void set_adapter(scoped_refptr<device::BluetoothAdapter> adapter);
|
|
|
| // IPC Handlers, see definitions in bluetooth_messages.h.
|
| - void OnRequestDevice(int thread_id, int request_id);
|
| + void OnRequestDevice(
|
| + int thread_id,
|
| + int request_id,
|
| + const std::vector<content::BluetoothScanFilter>& filters,
|
| + const std::vector<device::BluetoothUUID>& optional_services);
|
| void OnConnectGATT(int thread_id, int request_id,
|
| const std::string& device_instance_id);
|
| void OnGetPrimaryService(int thread_id,
|
| @@ -62,6 +74,7 @@ class CONTENT_EXPORT BluetoothDispatcherHost final
|
| void OnDiscoverySessionStarted(
|
| int thread_id,
|
| int request_id,
|
| + scoped_ptr<DiscoverySessionOptions> options,
|
| scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
|
| void OnDiscoverySessionStartedError(int thread_id, int request_id);
|
|
|
| @@ -69,10 +82,13 @@ class CONTENT_EXPORT BluetoothDispatcherHost final
|
| void StopDiscoverySession(
|
| int thread_id,
|
| int request_id,
|
| + scoped_ptr<DiscoverySessionOptions> options,
|
| scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
|
|
|
| // Callbacks for BluetoothDiscoverySession::Stop.
|
| - void OnDiscoverySessionStopped(int thread_id, int request_id);
|
| + void OnDiscoverySessionStopped(int thread_id,
|
| + int request_id,
|
| + scoped_ptr<DiscoverySessionOptions> options);
|
| void OnDiscoverySessionStoppedError(int thread_id, int request_id);
|
|
|
| // Callbacks for BluetoothDevice::CreateGattConnection
|
|
|