| 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..a8602786cde62a5a52038b4e82de894477049ce9 100644
|
| --- a/chromeos/dbus/fake_power_manager_client.cc
|
| +++ b/chromeos/dbus/fake_power_manager_client.cc
|
| @@ -9,6 +9,11 @@
|
| #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 +28,9 @@ FakePowerManagerClient::~FakePowerManagerClient() {
|
| }
|
|
|
| void FakePowerManagerClient::Init(dbus::Bus* bus) {
|
| + UpdatePowerProperties(
|
| + 50, false, power_manager::PowerSupplyProperties_BatteryState_DISCHARGING,
|
| + power_manager::PowerSupplyProperties_ExternalPower_DISCONNECTED);
|
| }
|
|
|
| void FakePowerManagerClient::AddObserver(Observer* observer) {
|
| @@ -34,7 +42,7 @@ void FakePowerManagerClient::RemoveObserver(Observer* observer) {
|
| }
|
|
|
| bool FakePowerManagerClient::HasObserver(const Observer* observer) const {
|
| - return false;
|
| + return observers_.HasObserver(observer);
|
| }
|
|
|
| void FakePowerManagerClient::SetRenderProcessManagerDelegate(
|
| @@ -63,6 +71,7 @@ void FakePowerManagerClient::IncreaseKeyboardBrightness() {
|
| }
|
|
|
| void FakePowerManagerClient::RequestStatusUpdate() {
|
| + NotifyObservers();
|
| }
|
|
|
| void FakePowerManagerClient::RequestSuspend() {
|
| @@ -129,6 +138,65 @@ 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;
|
| +
|
| + // Sets the charging state based on the battery percentage to mimic real
|
| + // implementation.
|
| + if (battery_percent == 100 &&
|
| + (battery_state ==
|
| + power_manager::PowerSupplyProperties_BatteryState_CHARGING ||
|
| + battery_state ==
|
| + power_manager::PowerSupplyProperties_BatteryState_FULL)) {
|
| + 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 (battery_state ==
|
| + power_manager::PowerSupplyProperties_BatteryState_CHARGING) {
|
| + props_.set_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_state(
|
| + power_manager::PowerSupplyProperties_BatteryState_DISCHARGING);
|
| + props_.set_battery_time_to_full_sec(0);
|
| + props_.set_battery_time_to_empty_sec(remaining_battery_sec);
|
| + }
|
| +
|
| + // Checks if the battery is in a discharging state first before setting a
|
| + // charger. It wouldn't make sense for the battery to be discharging on AC,
|
| + // but it is possible for it to be discharging on low power USB.
|
| + if (props_.battery_state() ==
|
| + power_manager::PowerSupplyProperties_BatteryState_DISCHARGING) {
|
| + props_.set_external_power(
|
| + external_power == power_manager::PowerSupplyProperties_ExternalPower_USB
|
| + ? power_manager::PowerSupplyProperties_ExternalPower_USB
|
| + : power_manager::PowerSupplyProperties_ExternalPower_DISCONNECTED);
|
| + } else {
|
| + props_.set_external_power(
|
| + external_power == power_manager::PowerSupplyProperties_ExternalPower_USB
|
| + ? power_manager::PowerSupplyProperties_ExternalPower_USB
|
| + : power_manager::PowerSupplyProperties_ExternalPower_AC);
|
| + }
|
| +
|
| + props_.set_battery_percent(battery_percent);
|
| + props_.set_is_calculating_battery_time(is_calculating_battery_time);
|
| +
|
| + NotifyObservers();
|
| +}
|
| +
|
| +void FakePowerManagerClient::NotifyObservers() {
|
| + FOR_EACH_OBSERVER(Observer, observers_, PowerChanged(props_));
|
| +}
|
| +
|
| void FakePowerManagerClient::HandleSuspendReadiness() {
|
| CHECK(num_pending_suspend_readiness_callbacks_ > 0);
|
|
|
|
|