Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1858)

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: 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
« no previous file with comments | « device/bluetooth/bluetooth_adapter_android.cc ('k') | device/bluetooth/bluetooth_adapter_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 9a2875d1760b18828941bd9510069fffbcac41b8..665f81339b3d5c0511565a4e8df1e1a7544001dd 100644
--- a/device/bluetooth/bluetooth_adapter_mac.mm
+++ b/device/bluetooth/bluetooth_adapter_mac.mm
@@ -445,7 +445,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]));
@@ -464,8 +464,8 @@ void BluetoothAdapterMac::LowEnergyDeviceUpdated(
if (!device_reference) {
VLOG(1) << "LowEnergyDeviceUpdated new device";
// 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;
« no previous file with comments | « device/bluetooth/bluetooth_adapter_android.cc ('k') | device/bluetooth/bluetooth_adapter_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698