diff options
| author | scheib <scheib@chromium.org> | 2015-09-16 15:09:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-16 22:10:57 +0000 |
| commit | eea0c48ed229131a6ce9fb61a883ae9272febe84 (patch) | |
| tree | 1a3635343895b85d1267af86aa6add7561a7f729 /device/bluetooth/bluetooth_device_win.cc | |
| parent | b55571cafb86bd1c970611b91bd65aeabf05f190 (diff) | |
| download | chromium_src-eea0c48ed229131a6ce9fb61a883ae9272febe84.zip chromium_src-eea0c48ed229131a6ce9fb61a883ae9272febe84.tar.gz chromium_src-eea0c48ed229131a6ce9fb61a883ae9272febe84.tar.bz2 | |
bluetooth: Add adapter to BluetoothDevice
The base class BluetoothDevice::CreateGattConnection implementation
requires access to the BluetoothAdapter. This patch updates all
subclasses to provide it.
Part of a 4 patch series:
https://crrev.com/1287753002 Remove Disconnect callback
https://crrev.com/1284073002 Add adapter_ to BluetoothDevice <<<
https://crrev.com/1292263002 BluetoothDevice::CreateGattConnection Impl
https://crrev.com/1256313002 Android Impl & tests.
BUG=512643
Review URL: https://codereview.chromium.org/1284073002
Cr-Commit-Position: refs/heads/master@{#349248}
Diffstat (limited to 'device/bluetooth/bluetooth_device_win.cc')
| -rw-r--r-- | device/bluetooth/bluetooth_device_win.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/device/bluetooth/bluetooth_device_win.cc b/device/bluetooth/bluetooth_device_win.cc index ed51d4b..f6a8b778 100644 --- a/device/bluetooth/bluetooth_device_win.cc +++ b/device/bluetooth/bluetooth_device_win.cc @@ -12,6 +12,7 @@ #include "base/memory/scoped_vector.h" #include "base/sequenced_task_runner.h" #include "base/strings/stringprintf.h" +#include "device/bluetooth/bluetooth_adapter_win.h" #include "device/bluetooth/bluetooth_service_record_win.h" #include "device/bluetooth/bluetooth_socket_thread.h" #include "device/bluetooth/bluetooth_socket_win.h" @@ -27,12 +28,13 @@ const char kApiUnavailable[] = "This API is not implemented on this platform."; namespace device { BluetoothDeviceWin::BluetoothDeviceWin( + BluetoothAdapterWin* adapter, const BluetoothTaskManagerWin::DeviceState& device_state, const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner, const scoped_refptr<BluetoothSocketThread>& socket_thread, net::NetLog* net_log, const net::NetLog::Source& net_log_source) - : BluetoothDevice(), + : BluetoothDevice(adapter), ui_task_runner_(ui_task_runner), socket_thread_(socket_thread), net_log_(net_log), |