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

Unified Diff: chromeos/dbus/power_manager_client.cc

Issue 2413963002: Replace FOR_EACH_OBSERVER in chromeos/ with range-based for (Closed)
Patch Set: Run the script again with '/mg' 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
« no previous file with comments | « chromeos/dbus/fake_update_engine_client.cc ('k') | chromeos/dbus/session_manager_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/power_manager_client.cc
diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc
index 3186f2ffefca09a4749dba19119694d173ae4b7e..73d21d5c320d70bf816af9bc7cfef809dac95aad 100644
--- a/chromeos/dbus/power_manager_client.cc
+++ b/chromeos/dbus/power_manager_client.cc
@@ -388,7 +388,8 @@ class PowerManagerClientImpl : public PowerManagerClient {
POWER_LOG(EVENT) << "Sending initial state to power manager";
RegisterSuspendDelays();
SetIsProjecting(last_is_projecting_);
- FOR_EACH_OBSERVER(Observer, observers_, PowerManagerRestarted());
+ for (auto& observer : observers_)
+ observer.PowerManagerRestarted();
}
}
@@ -404,8 +405,8 @@ class PowerManagerClientImpl : public PowerManagerClient {
}
POWER_LOG(DEBUG) << "Brightness changed to " << brightness_level
<< ": user initiated " << user_initiated;
- FOR_EACH_OBSERVER(Observer, observers_,
- BrightnessChanged(brightness_level, user_initiated));
+ for (auto& observer : observers_)
+ observer.BrightnessChanged(brightness_level, user_initiated);
}
void PeripheralBatteryStatusReceived(dbus::Signal* signal) {
@@ -425,8 +426,8 @@ class PowerManagerClientImpl : public PowerManagerClient {
POWER_LOG(DEBUG) << "Device battery status received " << level << " for "
<< name << " at " << path;
- FOR_EACH_OBSERVER(Observer, observers_,
- PeripheralBatteryStatusReceived(path, name, level));
+ for (auto& observer : observers_)
+ observer.PeripheralBatteryStatusReceived(path, name, level);
}
void PowerSupplyPollReceived(dbus::Signal* signal) {
@@ -479,7 +480,8 @@ class PowerManagerClientImpl : public PowerManagerClient {
void HandlePowerSupplyProperties(
const power_manager::PowerSupplyProperties& proto) {
- FOR_EACH_OBSERVER(Observer, observers_, PowerChanged(proto));
+ for (auto& observer : observers_)
+ observer.PowerChanged(proto);
const bool on_battery = proto.external_power() ==
power_manager::PowerSupplyProperties_ExternalPower_DISCONNECTED;
base::PowerMonitorDeviceSource::SetPowerSource(on_battery);
@@ -555,9 +557,11 @@ class PowerManagerClientImpl : public PowerManagerClient {
// instead of asynchronously.
notifying_observers_about_suspend_imminent_ = true;
if (suspending_from_dark_resume_)
- FOR_EACH_OBSERVER(Observer, observers_, DarkSuspendImminent());
+ for (auto& observer : observers_)
+ observer.DarkSuspendImminent();
else
- FOR_EACH_OBSERVER(Observer, observers_, SuspendImminent());
+ for (auto& observer : observers_)
+ observer.SuspendImminent();
notifying_observers_about_suspend_imminent_ = false;
base::PowerMonitorDeviceSource::HandleSystemSuspending();
@@ -609,8 +613,8 @@ class PowerManagerClientImpl : public PowerManagerClient {
suspending_from_dark_resume_ = false;
num_pending_suspend_readiness_callbacks_ = 0;
- FOR_EACH_OBSERVER(
- PowerManagerClient::Observer, observers_, SuspendDone(duration));
+ for (auto& observer : observers_)
+ observer.SuspendDone(duration);
base::PowerMonitorDeviceSource::HandleSystemResumed();
}
@@ -622,13 +626,15 @@ class PowerManagerClientImpl : public PowerManagerClient {
<< power_manager::kIdleActionImminentSignal << " signal";
return;
}
- FOR_EACH_OBSERVER(Observer, observers_,
- IdleActionImminent(base::TimeDelta::FromInternalValue(
- proto.time_until_idle_action())));
+ for (auto& observer : observers_) {
+ observer.IdleActionImminent(
+ base::TimeDelta::FromInternalValue(proto.time_until_idle_action()));
+ }
}
void IdleActionDeferredReceived(dbus::Signal* signal) {
- FOR_EACH_OBSERVER(Observer, observers_, IdleActionDeferred());
+ for (auto& observer : observers_)
+ observer.IdleActionDeferred();
}
void InputEventReceived(dbus::Signal* signal) {
@@ -650,8 +656,8 @@ class PowerManagerClientImpl : public PowerManagerClient {
case power_manager::InputEvent_Type_POWER_BUTTON_UP: {
const bool down =
(proto.type() == power_manager::InputEvent_Type_POWER_BUTTON_DOWN);
- FOR_EACH_OBSERVER(PowerManagerClient::Observer, observers_,
- PowerButtonEventReceived(down, timestamp));
+ for (auto& observer : observers_)
+ observer.PowerButtonEventReceived(down, timestamp);
// Tell powerd that Chrome has handled power button presses.
if (down) {
@@ -671,16 +677,16 @@ class PowerManagerClientImpl : public PowerManagerClient {
case power_manager::InputEvent_Type_LID_CLOSED: {
bool open =
(proto.type() == power_manager::InputEvent_Type_LID_OPEN);
- FOR_EACH_OBSERVER(PowerManagerClient::Observer, observers_,
- LidEventReceived(open, timestamp));
+ for (auto& observer : observers_)
+ observer.LidEventReceived(open, timestamp);
break;
}
case power_manager::InputEvent_Type_TABLET_MODE_ON:
case power_manager::InputEvent_Type_TABLET_MODE_OFF: {
bool on =
(proto.type() == power_manager::InputEvent_Type_TABLET_MODE_ON);
- FOR_EACH_OBSERVER(PowerManagerClient::Observer, observers_,
- TabletModeEventReceived(on, timestamp));
+ for (auto& observer : observers_)
+ observer.TabletModeEventReceived(on, timestamp);
break;
}
}
« no previous file with comments | « chromeos/dbus/fake_update_engine_client.cc ('k') | chromeos/dbus/session_manager_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698