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..79e9fec0bc514a677013f7120ef2aff54b1ec5e5 100644 |
--- a/chromeos/dbus/fake_power_manager_client.cc |
+++ b/chromeos/dbus/fake_power_manager_client.cc |
@@ -4,11 +4,18 @@ |
#include "chromeos/dbus/fake_power_manager_client.h" |
+#include <algorithm> |
+ |
#include "base/bind.h" |
#include "base/bind_helpers.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 +30,12 @@ FakePowerManagerClient::~FakePowerManagerClient() { |
} |
void FakePowerManagerClient::Init(dbus::Bus* bus) { |
+ UpdateBatteryPercentage(50); |
+ UpdateIsCalculatingBatteryTime(false); |
+ UpdateExternalPower( |
+ power_manager::PowerSupplyProperties_ExternalPower_DISCONNECTED); |
+ UpdateBatteryState( |
+ power_manager::PowerSupplyProperties_BatteryState_DISCHARGING); |
} |
void FakePowerManagerClient::AddObserver(Observer* observer) { |
@@ -34,7 +47,7 @@ void FakePowerManagerClient::RemoveObserver(Observer* observer) { |
} |
bool FakePowerManagerClient::HasObserver(const Observer* observer) const { |
- return false; |
+ return observers_.HasObserver(observer); |
} |
void FakePowerManagerClient::SetRenderProcessManagerDelegate( |
@@ -63,6 +76,7 @@ void FakePowerManagerClient::IncreaseKeyboardBrightness() { |
} |
void FakePowerManagerClient::RequestStatusUpdate() { |
+ NotifyObserver(); |
} |
void FakePowerManagerClient::RequestSuspend() { |
@@ -129,6 +143,77 @@ void FakePowerManagerClient::SendPowerButtonEvent( |
PowerButtonEventReceived(down, timestamp)); |
} |
+void FakePowerManagerClient::UpdateBatteryPercentage(int percentage) { |
+ props_.set_battery_percent(percentage); |
+ NotifyObserver(); |
+} |
+ |
+void FakePowerManagerClient::UpdateExternalPower( |
+ power_manager::PowerSupplyProperties::ExternalPower power_source) { |
+ switch (power_source) { |
Daniel Erat
2015/06/29 20:10:10
please change this to the simpler form until makin
mozartalouis
2015/06/29 21:37:07
Done.
|
+ case power_manager::PowerSupplyProperties_ExternalPower_USB: |
+ // Say that the system is charging on USB if charging is enabled |
+ // (i.e. a low-power charger). |
+ props_.set_external_power( |
+ power_manager::PowerSupplyProperties_ExternalPower_USB); |
+ break; |
+ case power_manager::PowerSupplyProperties_ExternalPower_AC: |
+ // Say that the system is charging on AC if charging is enabled. |
+ props_.set_external_power( |
+ power_manager::PowerSupplyProperties_ExternalPower_AC); |
+ break; |
+ case power_manager::PowerSupplyProperties_ExternalPower_DISCONNECTED: |
+ // Say discharging without any charger connected. |
+ props_.set_external_power( |
+ power_manager::PowerSupplyProperties_ExternalPower_DISCONNECTED); |
+ break; |
+ default: |
+ NOTREACHED() << "Unhandled power source " << power_source; |
+ } |
+ NotifyObserver(); |
+} |
+ |
+void FakePowerManagerClient::UpdateBatteryState( |
+ power_manager::PowerSupplyProperties::BatteryState state) { |
+ props_.set_battery_state(state); |
+ |
+ int64 remaining_battery_sec = static_cast<int>( |
Daniel Erat
2015/06/29 20:10:10
nit: change to int unless there's reason to believ
mozartalouis
2015/06/29 21:37:07
Done.
|
+ props_.battery_percent() * kDefaultBatteryLifeSpanSec / 100); |
+ |
+ if (props_.battery_percent() == 100 && |
+ props_.battery_state() == |
+ power_manager::PowerSupplyProperties_BatteryState_CHARGING) { |
+ props_.set_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 (props_.battery_state() == |
+ power_manager::PowerSupplyProperties_BatteryState_CHARGING) { |
+ props_.set_battery_state( |
+ power_manager::PowerSupplyProperties_BatteryState_CHARGING); |
+ props_.set_battery_time_to_full_sec( |
+ std::max(static_cast<int64>(1), |
+ kDefaultBatteryLifeSpanSec - remaining_battery_sec)); |
+ props_.set_battery_time_to_empty_sec(0); |
+ } else { |
+ props_.set_battery_state( |
+ power_manager::PowerSupplyProperties_BatteryState_DISCHARGING); |
+ props_.set_battery_time_to_full_sec(0); |
+ props_.set_battery_time_to_empty_sec(remaining_battery_sec); |
+ } |
+ NotifyObserver(); |
+} |
+ |
+void FakePowerManagerClient::UpdateIsCalculatingBatteryTime( |
+ bool is_calculating) { |
+ props_.set_is_calculating_battery_time(is_calculating); |
+ NotifyObserver(); |
+} |
+ |
+void FakePowerManagerClient::NotifyObserver() { |
+ FOR_EACH_OBSERVER(Observer, observers_, PowerChanged(props_)); |
+} |
+ |
void FakePowerManagerClient::HandleSuspendReadiness() { |
CHECK(num_pending_suspend_readiness_callbacks_ > 0); |