device/bluetooth/bluetooth_adapter_win.cc - Issue 1284073002: bluetooth: Add adapter to BluetoothDevice

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/bluetooth_adapter_win.cc

Issue 1284073002: bluetooth: Add adapter to BluetoothDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-drop-callback-

Patch Set: Merge TOT Created 5 years, 3 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: device/bluetooth/bluetooth_adapter_win.cc

diff --git a/device/bluetooth/bluetooth_adapter_win.cc b/device/bluetooth/bluetooth_adapter_win.cc

index 009a50b237c32585a00e2b724d9245272f1f3f1f..78e7439914bb65e05818b83e18eff03c5c4ec548 100644

--- a/device/bluetooth/bluetooth_adapter_win.cc

+++ b/device/bluetooth/bluetooth_adapter_win.cc

@@ -272,11 +272,8 @@ void BluetoothAdapterWin::DevicesPolled(

BluetoothTaskManagerWin::DeviceState* device_state = (*iter);

if (added_devices.find(device_state->address) != added_devices.end()) {

BluetoothDeviceWin* device_win =

- new BluetoothDeviceWin(*device_state,

- ui_task_runner_,

- socket_thread_,

- NULL,

- net::NetLog::Source());

+ new BluetoothDeviceWin(this, *device_state, ui_task_runner_,

+ socket_thread_, NULL, net::NetLog::Source());

devices_[device_state->address] = device_win;

FOR_EACH_OBSERVER(BluetoothAdapter::Observer,

observers_,

« no previous file with comments | « device/bluetooth/bluetooth_adapter_mac_unittest.mm ('k') | device/bluetooth/bluetooth_classic_device_mac.h » ('j') | no next file with comments »