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

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

Issue 1172853004: Chromium side of RequestDeviceOptions implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Add an end-namespace comment Created 5 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
« no previous file with comments | « no previous file | content/browser/bluetooth/bluetooth_dispatcher_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 94d225123000240bf7a9d4c498487396255ac350..0e023828ce655efab003d30e6021baa5e929a16e 100644
--- a/content/browser/bluetooth/bluetooth_dispatcher_host.h
+++ b/content/browser/bluetooth/bluetooth_dispatcher_host.h
@@ -13,8 +13,14 @@
#include "device/bluetooth/bluetooth_gatt_connection.h"
#include "device/bluetooth/bluetooth_gatt_service.h"
+namespace device {
+class BluetoothUUID;
+}
+
namespace content {
+struct BluetoothScanFilter;
+
// Dispatches and sends bluetooth related messages sent to/from a child
// process BluetoothDispatcher from/to the main browser process.
//
@@ -46,12 +52,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,
@@ -70,6 +82,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);
@@ -77,10 +90,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.
« no previous file with comments | « no previous file | content/browser/bluetooth/bluetooth_dispatcher_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698