summaryrefslogtreecommitdiffstats
path: root/device/bluetooth/bluetooth_device_win.cc
diff options
context:
space:
mode:
authorkeybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-02 16:07:31 +0000
committerkeybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-02 16:07:31 +0000
commit2c24d9436912ec660b810dc0ad980b65155c8252 (patch)
treee465dac2d5aa7d2a9621181eb3d8349ee038f9d1 /device/bluetooth/bluetooth_device_win.cc
parent640c6dbcde383305d960e3a9b0a40a09e3910a1e (diff)
downloadchromium_src-2c24d9436912ec660b810dc0ad980b65155c8252.zip
chromium_src-2c24d9436912ec660b810dc0ad980b65155c8252.tar.gz
chromium_src-2c24d9436912ec660b810dc0ad980b65155c8252.tar.bz2
Reimplement BluetoothSocketChromeOS
Since Chrome OS uses a socket-based interface much of the code already in BluetoothSocketWin is suitable. Separate out that common code into a new BluetoothSocketNet class and have both implementations derive from that class with their differing Connect implementations remaining separate. BUG=362613 Review URL: https://codereview.chromium.org/267633003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/bluetooth/bluetooth_device_win.cc')
-rw-r--r--device/bluetooth/bluetooth_device_win.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/device/bluetooth/bluetooth_device_win.cc b/device/bluetooth/bluetooth_device_win.cc
index 53995ff..eee009b 100644
--- a/device/bluetooth/bluetooth_device_win.cc
+++ b/device/bluetooth/bluetooth_device_win.cc
@@ -14,7 +14,7 @@
#include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
#include "device/bluetooth/bluetooth_profile_win.h"
#include "device/bluetooth/bluetooth_service_record_win.h"
-#include "device/bluetooth/bluetooth_socket_thread_win.h"
+#include "device/bluetooth/bluetooth_socket_thread.h"
#include "device/bluetooth/bluetooth_socket_win.h"
#include "device/bluetooth/bluetooth_task_manager_win.h"
@@ -29,7 +29,7 @@ namespace device {
BluetoothDeviceWin::BluetoothDeviceWin(
const BluetoothTaskManagerWin::DeviceState& state,
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
- scoped_refptr<BluetoothSocketThreadWin> socket_thread,
+ scoped_refptr<BluetoothSocketThread> socket_thread,
net::NetLog* net_log,
const net::NetLog::Source& net_log_source)
: BluetoothDevice(),