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

Unified Diff: trunk/src/device/bluetooth/bluetooth_device_win.h

Issue 227493006: Revert 262175 "* Replace "read" method with onReceiveXxx events." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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: 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_;
« no previous file with comments | « trunk/src/device/bluetooth/bluetooth_device_mac.mm ('k') | trunk/src/device/bluetooth/bluetooth_device_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698