device/bluetooth/bluetooth_device_chromeos.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_device_chromeos.cc

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

Patch Set: Updated patchset dependency Created 5 years, 4 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

« no previous file with comments | « device/bluetooth/bluetooth_device_android.cc ('k') | device/bluetooth/bluetooth_device_mac.h » ('j') | device/bluetooth/test/mock_bluetooth_gatt_connection.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_device_chromeos.cc

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

index 30b5379714ff9b96aa44208d455d94c9d2723acf..97bbe66c0ff377467357a9cdb2ac89280211a13d 100644

--- a/device/bluetooth/bluetooth_device_chromeos.cc

+++ b/device/bluetooth/bluetooth_device_chromeos.cc

@@ -125,7 +125,8 @@ BluetoothDeviceChromeOS::BluetoothDeviceChromeOS(

const dbus::ObjectPath& object_path,

scoped_refptr<base::SequencedTaskRunner> ui_task_runner,

scoped_refptr<device::BluetoothSocketThread> socket_thread)

- : adapter_(adapter),

+ : BluetoothDevice(adapter),

+ adapter_(adapter),

Jeffrey Yasskin 2015/08/19 22:19:04 Would it make sense to remove this member, and ins

scheib 2015/09/13 02:40:11 Done.

object_path_(object_path),

num_connecting_calls_(0),

connection_monitor_started_(false),