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..c5cabc37d0b77ecd55c26ac295af0bc4397286ff 100644 |
--- a/chromeos/dbus/fake_power_manager_client.cc |
+++ b/chromeos/dbus/fake_power_manager_client.cc |
@@ -6,12 +6,19 @@ |
#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), |
+ : num_request_notify_observers_(0), |
+ num_request_restart_calls_(0), |
num_request_shutdown_calls_(0), |
num_set_policy_calls_(0), |
num_set_is_projecting_calls_(0), |
@@ -23,6 +30,9 @@ FakePowerManagerClient::~FakePowerManagerClient() { |
} |
void FakePowerManagerClient::Init(dbus::Bus* bus) { |
+ UpdatePowerProperties( |
+ 50, false, power_manager::PowerSupplyProperties_BatteryState_DISCHARGING, |
+ power_manager::PowerSupplyProperties_ExternalPower_DISCONNECTED); |
oshima
2015/07/09 00:15:39
do you still need this?
mozartalouis
2015/07/09 01:56:15
We need it for when chrome starts on the Linux env
oshima
2015/07/09 17:10:15
If this is necessary, please call this in your tes
|
} |
void FakePowerManagerClient::AddObserver(Observer* observer) { |
@@ -34,7 +44,7 @@ void FakePowerManagerClient::RemoveObserver(Observer* observer) { |
} |
bool FakePowerManagerClient::HasObserver(const Observer* observer) const { |
- return false; |
+ return observers_.HasObserver(observer); |
} |
void FakePowerManagerClient::SetRenderProcessManagerDelegate( |
@@ -63,6 +73,7 @@ void FakePowerManagerClient::IncreaseKeyboardBrightness() { |
} |
void FakePowerManagerClient::RequestStatusUpdate() { |
+ NotifyObservers(); |
} |
void FakePowerManagerClient::RequestSuspend() { |
@@ -129,6 +140,45 @@ void FakePowerManagerClient::SendPowerButtonEvent( |
PowerButtonEventReceived(down, timestamp)); |
} |
+void FakePowerManagerClient::UpdatePowerProperties( |
+ int battery_percent, |
+ bool is_calculating_battery_time, |
+ power_manager::PowerSupplyProperties::BatteryState battery_state, |
+ power_manager::PowerSupplyProperties::ExternalPower external_power) { |
+ int remaining_battery_sec = |
+ battery_percent * kDefaultBatteryLifeSpanSec / 100; |
+ |
+ props_.set_battery_percent(battery_percent); |
+ props_.set_is_calculating_battery_time(is_calculating_battery_time); |
+ props_.set_battery_state(battery_state); |
+ props_.set_external_power(external_power); |
+ |
+ // Sets |time_to_full| and |time_to_empty| based on the set properties |
+ if (battery_percent == 100 && |
+ (battery_state == |
+ power_manager::PowerSupplyProperties_BatteryState_CHARGING || |
+ battery_state == |
+ power_manager::PowerSupplyProperties_BatteryState_FULL)) { |
+ props_.set_battery_time_to_full_sec(0); |
+ props_.set_battery_time_to_empty_sec(0); |
+ } else if (battery_state == |
+ power_manager::PowerSupplyProperties_BatteryState_CHARGING) { |
+ props_.set_battery_time_to_full_sec(kDefaultBatteryLifeSpanSec - |
+ remaining_battery_sec); |
+ props_.set_battery_time_to_empty_sec(0); |
+ } else { |
+ props_.set_battery_time_to_full_sec(0); |
+ props_.set_battery_time_to_empty_sec(remaining_battery_sec); |
+ } |
+ |
+ NotifyObservers(); |
+} |
+ |
+void FakePowerManagerClient::NotifyObservers() { |
+ FOR_EACH_OBSERVER(Observer, observers_, PowerChanged(props_)); |
+ ++num_request_notify_observers_; |
+} |
+ |
void FakePowerManagerClient::HandleSuspendReadiness() { |
CHECK(num_pending_suspend_readiness_callbacks_ > 0); |