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

Unified Diff: device/bluetooth/bluetooth_device_win.h

Issue 180163009: chrome.bluetooth API improvements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address code review feedback, simplify threading model. Created 6 years, 9 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: device/bluetooth/bluetooth_device_win.h
diff --git a/device/bluetooth/bluetooth_device_win.h b/device/bluetooth/bluetooth_device_win.h
index 274364b5445d05f30d0544f086e05c25245f0f8b..c6e1b9785b2586ab74ae2c63903c89bdb80d21e6 100644
--- a/device/bluetooth/bluetooth_device_win.h
+++ b/device/bluetooth/bluetooth_device_win.h
@@ -16,11 +16,16 @@ namespace device {
class BluetoothAdapterWin;
class BluetoothServiceRecord;
+class BluetoothSocketThreadWin;
class BluetoothDeviceWin : public BluetoothDevice {
public:
explicit BluetoothDeviceWin(
- const BluetoothTaskManagerWin::DeviceState& state);
+ const BluetoothTaskManagerWin::DeviceState& state,
+ scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
+ scoped_refptr<BluetoothSocketThreadWin> socket_thread,
+ net::NetLog* net_log,
+ const net::NetLog::Source& net_log_source);
virtual ~BluetoothDeviceWin();
// BluetoothDevice override
@@ -63,7 +68,7 @@ class BluetoothDeviceWin : public BluetoothDevice {
virtual void ConnectToProfile(
device::BluetoothProfile* profile,
const base::Closure& callback,
- const ErrorCallback& error_callback) OVERRIDE;
+ const ConnectToProfileErrorCallback& error_callback) OVERRIDE;
virtual void SetOutOfBandPairingData(
const BluetoothOutOfBandPairingData& data,
const base::Closure& callback,
@@ -85,6 +90,11 @@ class BluetoothDeviceWin : public BluetoothDevice {
// discovery.
void SetVisible(bool visible);
+ scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
+ scoped_refptr<BluetoothSocketThreadWin> socket_thread_;
+ net::NetLog* net_log_;
+ net::NetLog::Source net_log_source_;
+
// The Bluetooth class of the device, a bitmask that may be decoded using
// https://www.bluetooth.org/Technical/AssignedNumbers/baseband.htm
uint32 bluetooth_class_;

Powered by Google App Engine
This is Rietveld 408576698