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

Unified Diff: device/bluetooth/bluez/bluetooth_adapter_bluez.cc

Issue 2423793002: Remove usage of FOR_EACH_OBSERVER macro in device/ (Closed)
Patch Set: rebase Created 4 years, 2 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/bluez/bluetooth_adapter_bluez.cc
diff --git a/device/bluetooth/bluez/bluetooth_adapter_bluez.cc b/device/bluetooth/bluez/bluetooth_adapter_bluez.cc
index ad4510ac08d7c446f9bcc12d19139965ffb4c232..6377518bda73ee12251552d9adb0aa79792d1cf7 100644
--- a/device/bluetooth/bluez/bluetooth_adapter_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_adapter_bluez.cc
@@ -539,8 +539,8 @@ void BluetoothAdapterBlueZ::DeviceAdded(const dbus::ObjectPath& object_path) {
devices_.set(device_bluez->GetAddress(),
std::unique_ptr<BluetoothDevice>(device_bluez));
- FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
- DeviceAdded(this, device_bluez));
+ for (auto& observer : observers_)
+ observer.DeviceAdded(this, device_bluez);
}
void BluetoothAdapterBlueZ::DeviceRemoved(const dbus::ObjectPath& object_path) {
@@ -552,8 +552,8 @@ void BluetoothAdapterBlueZ::DeviceRemoved(const dbus::ObjectPath& object_path) {
std::unique_ptr<BluetoothDevice> scoped_device =
devices_.take_and_erase(iter->first);
- FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
- DeviceRemoved(this, device_bluez));
+ for (auto& observer : observers_)
+ observer.DeviceRemoved(this, device_bluez);
return;
}
}
@@ -1004,16 +1004,16 @@ void BluetoothAdapterBlueZ::RemoveAdapter() {
devices_swapped.swap(devices_);
for (auto& iter : devices_swapped) {
- FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
- DeviceRemoved(this, iter.second));
+ for (auto& observer : observers_)
+ observer.DeviceRemoved(this, iter.second);
}
PresentChanged(false);
}
void BluetoothAdapterBlueZ::DiscoverableChanged(bool discoverable) {
- FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
- AdapterDiscoverableChanged(this, discoverable));
+ for (auto& observer : observers_)
+ observer.AdapterDiscoverableChanged(this, discoverable);
}
void BluetoothAdapterBlueZ::DiscoveringChanged(bool discovering) {
@@ -1026,13 +1026,13 @@ void BluetoothAdapterBlueZ::DiscoveringChanged(bool discovering) {
num_discovery_sessions_ = 0;
MarkDiscoverySessionsAsInactive();
}
- FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
- AdapterDiscoveringChanged(this, discovering));
+ for (auto& observer : observers_)
+ observer.AdapterDiscoveringChanged(this, discovering);
}
void BluetoothAdapterBlueZ::PresentChanged(bool present) {
- FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
- AdapterPresentChanged(this, present));
+ for (auto& observer : observers_)
+ observer.AdapterPresentChanged(this, present);
}
void BluetoothAdapterBlueZ::NotifyDeviceAddressChanged(
@@ -1040,8 +1040,8 @@ void BluetoothAdapterBlueZ::NotifyDeviceAddressChanged(
const std::string& old_address) {
DCHECK(device->adapter_ == this);
- FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
- DeviceAddressChanged(this, device, old_address));
+ for (auto& observer : observers_)
+ observer.DeviceAddressChanged(this, device, old_address);
}
void BluetoothAdapterBlueZ::UseProfile(
« no previous file with comments | « device/bluetooth/bluetooth_task_manager_win.cc ('k') | device/bluetooth/bluez/bluetooth_advertisement_bluez.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698