device/bluetooth/bluetooth_adapter_mac.mm - 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_mac.mm

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_adapter_android.cc ('k') | device/bluetooth/bluetooth_adapter_mac_unittest.mm » ('j') | device/bluetooth/bluetooth_device_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_adapter_mac.mm

diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm

index bdbca4694f5322940349080f92124f3e488c51ac..e56cfb9dedae66897e35cfd63be3cb0cbedd8327 100644

--- a/device/bluetooth/bluetooth_adapter_mac.mm

+++ b/device/bluetooth/bluetooth_adapter_mac.mm

@@ -441,7 +441,7 @@ void BluetoothAdapterMac::ClassicDeviceAdded(IOBluetoothDevice* device) {

if (devices_.count(device_address))

return;

- devices_[device_address] = new BluetoothClassicDeviceMac(device);

+ devices_[device_address] = new BluetoothClassicDeviceMac(this, device);

FOR_EACH_OBSERVER(BluetoothAdapter::Observer,

observers_,

DeviceAdded(this, devices_[device_address]));

@@ -459,8 +459,8 @@ void BluetoothAdapterMac::LowEnergyDeviceUpdated(

BluetoothDevice*& device_reference = devices_[device_address];

if (!device_reference) {

// A new device has been found.

- device_reference =

- new BluetoothLowEnergyDeviceMac(peripheral, advertisement_data, rssi);

+ device_reference = new BluetoothLowEnergyDeviceMac(

+ this, peripheral, advertisement_data, rssi);

FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,

DeviceAdded(this, device_reference));

return;