| Index: device/bluetooth/bluetooth_device_win.h
|
| diff --git a/device/bluetooth/bluetooth_device_win.h b/device/bluetooth/bluetooth_device_win.h
|
| index 80c82062c329c7f26cce0229d9a1d19226510d56..36af035e3fa7e53cb11bb5ccce993b9397418f92 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
|
| @@ -57,7 +62,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,
|
| @@ -82,6 +87,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_;
|
|
|