diff options
author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 19:58:52 +0000 |
---|---|---|
committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 19:58:52 +0000 |
commit | dc85cefeac3ce32fe326af854676f4d0ca3bd90a (patch) | |
tree | 73fc7ff21bc50d1c36c8c082397f7f6651d23c76 /device/bluetooth/bluetooth_device_win.h | |
parent | 4b22d0aac0b8300ea268a92ae071235902efad83 (diff) | |
download | chromium_src-dc85cefeac3ce32fe326af854676f4d0ca3bd90a.zip chromium_src-dc85cefeac3ce32fe326af854676f4d0ca3bd90a.tar.gz chromium_src-dc85cefeac3ce32fe326af854676f4d0ca3bd90a.tar.bz2 |
Revert 262175 "* Replace "read" method with onReceiveXxx events."
Failed compile on Linux CrOS Full: http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Full/builds/2043/steps/compile/logs/stdio
> * Replace "read" method with onReceiveXxx events.
> * Few minor changes to idl file.
> * Socket implementation on Windows fully implemented and with (hopefully) correct threading usage.
> * ChromeOS and MacOS socket implementation empty for now (they will come in later CLs).
>
> BUG=336824,340363, 340413, 343651, 344081
>
> Review URL: https://codereview.chromium.org/180163009
TBR=rpaquay@chromium.org
Review URL: https://codereview.chromium.org/227493006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/bluetooth/bluetooth_device_win.h')
-rw-r--r-- | device/bluetooth/bluetooth_device_win.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/device/bluetooth/bluetooth_device_win.h b/device/bluetooth/bluetooth_device_win.h index acbb350..0ba0796 100644 --- a/device/bluetooth/bluetooth_device_win.h +++ b/device/bluetooth/bluetooth_device_win.h @@ -16,16 +16,11 @@ namespace device { 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 @@ class BluetoothDeviceWin : public BluetoothDevice { 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 @@ 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_; |