| Index: trunk/src/device/bluetooth/bluetooth_device_win.h
|
| ===================================================================
|
| --- trunk/src/device/bluetooth/bluetooth_device_win.h (revision 262179)
|
| +++ trunk/src/device/bluetooth/bluetooth_device_win.h (working copy)
|
| @@ -16,16 +16,11 @@
|
|
|
| class BluetoothAdapterWin;
|
| class BluetoothServiceRecord;
|
| -class BluetoothSocketThreadWin;
|
|
|
| class BluetoothDeviceWin : public BluetoothDevice {
|
| public:
|
| explicit BluetoothDeviceWin(
|
| - 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);
|
| + const BluetoothTaskManagerWin::DeviceState& state);
|
| virtual ~BluetoothDeviceWin();
|
|
|
| // BluetoothDevice override
|
| @@ -62,7 +57,7 @@
|
| virtual void ConnectToProfile(
|
| device::BluetoothProfile* profile,
|
| const base::Closure& callback,
|
| - const ConnectToProfileErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) OVERRIDE;
|
| virtual void SetOutOfBandPairingData(
|
| const BluetoothOutOfBandPairingData& data,
|
| const base::Closure& callback,
|
| @@ -87,11 +82,6 @@
|
| // 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_;
|
|
|