Chromium Code Reviews| Index: ui/display/chromeos/display_configurator.h |
| diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h |
| index aba0fa67a43170e8875471a608cc9ffa00ee81f2..b59832aa1936f29b03ba0d9f334eda08165a8028 100644 |
| --- a/ui/display/chromeos/display_configurator.h |
| +++ b/ui/display/chromeos/display_configurator.h |
| @@ -300,13 +300,12 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver { |
| typedef std::map<ContentProtectionClientId, ContentProtections> |
| ProtectionRequests; |
| + void SetDisplayPowerInternal(chromeos::DisplayPowerState power_state, |
|
Daniel Erat
2016/04/22 21:37:33
add a comment here. maybe something like:
// Up
dbasehore
2016/04/22 22:18:57
Done.
|
| + int flags, |
| + const ConfigurationCallback& callback); |
|
Daniel Erat
2016/04/22 21:37:33
nit: add a blank line after this one
dbasehore
2016/04/22 22:18:57
Done.
|
| // Configures displays. Invoked by |configure_timer_|. |
| void ConfigureDisplays(); |
| - // Restores |requested_power_state_| after the system has resumed, |
| - // additionally forcing a probe. Invoked by |configure_timer_|. |
| - void RestoreRequestedPowerStateAfterResume(); |
| - |
| // Notifies observers about an attempted state change. |
| void NotifyDisplayStateObservers(bool success, |
| MultipleDisplayState attempted_state); |
| @@ -394,11 +393,15 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver { |
| // Stores the requested power state. |
| chromeos::DisplayPowerState requested_power_state_; |
| - // True if |requested_power_state_| has been changed due to a user request. |
| - bool requested_power_state_change_; |
| + // Stores the power state to configure. May be the requested_power_state_ or |
|
Daniel Erat
2016/04/22 21:37:33
nit: maybe change this to "The power state to be a
dbasehore
2016/04/22 22:18:57
Done.
|
| + // DISPLAY_POWER_ALL_OFF for suspend. |
| + chromeos::DisplayPowerState pending_power_state_; |
| + |
| + // True if |pending_power_state_| has been changed. |
| + bool pending_power_state_change_; |
|
Daniel Erat
2016/04/22 21:37:33
mind renaming this to something like |have_pending
dbasehore
2016/04/22 22:18:57
Changed to has_pending_power_state_ since third pe
|
| // Bitwise-or value of the |kSetDisplayPower*| flags defined above. |
| - int requested_power_flags_; |
| + int pending_power_flags_; |
| // List of callbacks from callers waiting for the display configuration to |
| // start/finish. Note these callbacks belong to the pending request, not a |