Chromium Code Reviews| Index: chromeos/dbus/fake_power_manager_client.cc |
| diff --git a/chromeos/dbus/fake_power_manager_client.cc b/chromeos/dbus/fake_power_manager_client.cc |
| index 6c9a3872726a62a4ba5f0f2f353219f2e885b950..54551f45f0cd03aa9514658e11668aa7d9176353 100644 |
| --- a/chromeos/dbus/fake_power_manager_client.cc |
| +++ b/chromeos/dbus/fake_power_manager_client.cc |
| @@ -6,9 +6,15 @@ |
| #include "base/bind.h" |
| #include "base/bind_helpers.h" |
| +#include "base/logging.h" |
| #include "base/time/time.h" |
| namespace chromeos { |
| +namespace { |
| + |
| +const int kDefaultBatteryLifeSpanSec = 6 * 3600; // 6 hours |
| + |
| +} // namespace |
| FakePowerManagerClient::FakePowerManagerClient() |
| : num_request_restart_calls_(0), |
| @@ -23,6 +29,16 @@ FakePowerManagerClient::~FakePowerManagerClient() { |
| } |
| void FakePowerManagerClient::Init(dbus::Bus* bus) { |
| + int remaining_battery_sec = 50 * kDefaultBatteryLifeSpanSec / 100; |
| + props_.set_battery_percent(50); |
| + props_.set_is_calculating_battery_time(false); |
| + props_.set_battery_state( |
| + power_manager::PowerSupplyProperties_BatteryState_DISCHARGING); |
| + props_.set_external_power( |
| + power_manager::PowerSupplyProperties_ExternalPower_DISCONNECTED); |
| + props_.set_battery_time_to_full_sec(0); |
| + props_.set_battery_time_to_empty_sec(remaining_battery_sec); |
| + NotifyObservers(); |
|
oshima
2015/07/10 22:39:40
I'm not sure if these are necessary/useful. I'll l
|
| } |
| void FakePowerManagerClient::AddObserver(Observer* observer) { |
| @@ -34,7 +50,7 @@ void FakePowerManagerClient::RemoveObserver(Observer* observer) { |
| } |
| bool FakePowerManagerClient::HasObserver(const Observer* observer) const { |
| - return false; |
| + return observers_.HasObserver(observer); |
| } |
| void FakePowerManagerClient::SetRenderProcessManagerDelegate( |
| @@ -63,6 +79,7 @@ void FakePowerManagerClient::IncreaseKeyboardBrightness() { |
| } |
| void FakePowerManagerClient::RequestStatusUpdate() { |
| + NotifyObservers(); |
| } |
| void FakePowerManagerClient::RequestSuspend() { |
| @@ -129,6 +146,17 @@ void FakePowerManagerClient::SendPowerButtonEvent( |
| PowerButtonEventReceived(down, timestamp)); |
| } |
| +void FakePowerManagerClient::UpdatePowerProperties( |
| + const power_manager::PowerSupplyProperties& proto) { |
| + props_.Clear(); |
|
oshima
2015/07/10 22:39:40
you don't need to call Clear(). The following line
mozartalouis
2015/07/14 20:01:28
Done.
|
| + props_ = proto; |
| + NotifyObservers(); |
| +} |
| + |
| +void FakePowerManagerClient::NotifyObservers() { |
| + FOR_EACH_OBSERVER(Observer, observers_, PowerChanged(props_)); |
| +} |
| + |
| void FakePowerManagerClient::HandleSuspendReadiness() { |
| CHECK(num_pending_suspend_readiness_callbacks_ > 0); |