Chromium Code Reviews| Index: chrome/browser/ui/webui/settings/chromeos/device_power_handler.h |
| diff --git a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.h b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.h |
| index eaaf0cc9a58aab050e582f7552e5806484e53255..28ad708a77af96863400a2fec5f913ed74e6ef6d 100644 |
| --- a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.h |
| +++ b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.h |
| @@ -5,11 +5,20 @@ |
| #ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_DEVICE_POWER_HANDLER_H_ |
| #define CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_DEVICE_POWER_HANDLER_H_ |
| +#include <memory> |
| + |
| #include "ash/system/power/power_status.h" |
| #include "base/macros.h" |
| +#include "base/memory/weak_ptr.h" |
| #include "base/scoped_observer.h" |
| #include "base/strings/string16.h" |
| +#include "base/time/time.h" |
|
michaelpg
2017/06/16 01:35:00
can you forward declare TimeTicks instead?
Daniel Erat
2017/06/16 02:34:24
Done.
|
| #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" |
| +#include "chromeos/dbus/power_manager_client.h" |
| +#include "chromeos/dbus/power_policy_controller.h" |
| + |
| +class PrefChangeRegistrar; |
| +class PrefService; |
| namespace base { |
| class ListValue; |
| @@ -20,9 +29,44 @@ namespace settings { |
| // Chrome OS battery status and power settings handler. |
| class PowerHandler : public ::settings::SettingsPageUIHandler, |
| - public ash::PowerStatus::Observer { |
| + public ash::PowerStatus::Observer, |
| + public PowerManagerClient::Observer { |
| public: |
| - PowerHandler(); |
| + // Idle behaviors presented in the UI. These are mapped to preferences by |
| + // HandleSetIdleBehavior(). Values are shared with JS and exposed here for |
| + // tests. |
| + enum class IdleBehavior { |
| + DISPLAY_OFF_SLEEP = 0, |
| + DISPLAY_OFF_STAY_AWAKE = 1, |
| + DISPLAY_ON = 2, |
| + OTHER = 3, |
| + }; |
| + |
| + // WebUI message name and dictionary keys. Shared with tests. |
| + static const char kPowerManagementSettingsChangedName[]; |
| + static const char kIdleBehaviorKey[]; |
| + static const char kIdleManagedKey[]; |
| + static const char kLidClosedBehaviorKey[]; |
| + static const char kLidClosedManagedKey[]; |
| + static const char kHasLidKey[]; |
| + |
| + // Class used by tests to interact with PowerHandler internals. |
| + class TestAPI { |
| + public: |
| + explicit TestAPI(PowerHandler* handler); |
| + ~TestAPI(); |
| + |
| + void RequestPowerManagementSettings(); |
| + void SetIdleBehavior(IdleBehavior behavior); |
| + void SetLidClosedBehavior(PowerPolicyController::Action behavior); |
| + |
| + private: |
| + PowerHandler* handler_; // Not owned. |
| + |
| + DISALLOW_COPY_AND_ASSIGN(TestAPI); |
| + }; |
| + |
| + explicit PowerHandler(PrefService* prefs); |
| ~PowerHandler() override; |
| // SettingsPageUIHandler implementation. |
| @@ -33,6 +77,11 @@ class PowerHandler : public ::settings::SettingsPageUIHandler, |
| // ash::PowerStatus::Observer implementation. |
| void OnPowerStatusChanged() override; |
| + // PowerManagerClient implementation. |
| + void PowerManagerRestarted() override; |
| + void LidEventReceived(PowerManagerClient::LidState state, |
| + const base::TimeTicks& timestamp) override; |
| + |
| private: |
| // Handler to request updating the power status. |
| void HandleUpdatePowerStatus(const base::ListValue* args); |
| @@ -40,15 +89,53 @@ class PowerHandler : public ::settings::SettingsPageUIHandler, |
| // Handler to change the power source. |
| void HandleSetPowerSource(const base::ListValue* args); |
| + // Handler to request the current power management settings. Just calls |
| + // SendPowerManagementSettings(). |
| + void HandleRequestPowerManagementSettings(const base::ListValue* args); |
| + |
| + // Handlers to change the idle and lid-closed behaviors. |
| + void HandleSetIdleBehavior(const base::ListValue* args); |
| + void HandleSetLidClosedBehavior(const base::ListValue* args); |
| + |
| // Updates the UI with the current battery status. |
| void SendBatteryStatus(); |
| // Updates the UI with a list of available dual-role power sources. |
| void SendPowerSources(); |
| - ash::PowerStatus* power_status_; |
| + // Updates the UI to display the current power management settings. If the |
| + // settings didn't change since the previous call, nothing is sent unless |
| + // |force| is true. |
| + void SendPowerManagementSettings(bool force); |
| + |
| + // Callback used to receive switch states from PowerManagerClient. |
| + void OnGotSwitchStates(PowerManagerClient::LidState lid_state, |
| + PowerManagerClient::TabletMode tablet_mode); |
| + |
| + PrefService* prefs_; // Not owned. |
| + ash::PowerStatus* power_status_; // Not owned. |
| + |
| + // Used to watch power management prefs for changes so the UI can be notified. |
| + std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_; |
| + |
| + ScopedObserver<ash::PowerStatus, PowerHandler> power_status_observer_; |
| + ScopedObserver<PowerManagerClient, PowerHandler> |
| + power_manager_client_observer_; |
| + |
| + // Last lid state received from powerd. |
| + PowerManagerClient::LidState lid_state_ = PowerManagerClient::LidState::OPEN; |
| + |
| + // Last values sent by SendPowerManagementSettings(), cached here so |
| + // SendPowerManagementSettings() can avoid spamming the UI after this class |
| + // changes multiple prefs at once. |
| + IdleBehavior last_idle_behavior_ = IdleBehavior::DISPLAY_OFF_SLEEP; |
| + PowerPolicyController::Action last_lid_closed_behavior_ = |
| + PowerPolicyController::ACTION_SUSPEND; |
| + bool last_idle_managed_ = false; |
| + bool last_lid_closed_managed_ = false; |
| + bool last_has_lid_ = true; |
| - ScopedObserver<ash::PowerStatus, PowerHandler> power_observer_; |
| + base::WeakPtrFactory<PowerHandler> weak_ptr_factory_; |
| DISALLOW_COPY_AND_ASSIGN(PowerHandler); |
| }; |