| Index: ash/system/chromeos/power/tablet_power_button_controller.h
|
| diff --git a/ash/system/chromeos/power/tablet_power_button_controller.h b/ash/system/chromeos/power/tablet_power_button_controller.h
|
| index b99148efaab18721db5814830f3ef9200d35a7c5..78cecebc2ab311df6c1754d1bd86580edc365b12 100644
|
| --- a/ash/system/chromeos/power/tablet_power_button_controller.h
|
| +++ b/ash/system/chromeos/power/tablet_power_button_controller.h
|
| @@ -42,6 +42,12 @@ class ASH_EXPORT TabletPowerButtonController
|
| // Emulates |shutdown_timer_| timeout.
|
| void TriggerShutdownTimeout();
|
|
|
| + // Returns true when |lock_screen_timer_| is running.
|
| + bool LockScreenTimerIsRunning() const;
|
| +
|
| + // Emulates |lock_screen_timer_| timeout.
|
| + void TriggerLockScreenTimeout();
|
| +
|
| private:
|
| TabletPowerButtonController* controller_; // Not owned.
|
|
|
| @@ -101,6 +107,9 @@ class ASH_EXPORT TabletPowerButtonController
|
| // and locking is possible.
|
| void LockScreenIfRequired();
|
|
|
| + // Called by |lock_screen_timer_| to start locking screen.
|
| + void OnLockScreenTimeout();
|
| +
|
| // True if the brightness level is currently set to off.
|
| bool brightness_level_is_zero_ = false;
|
|
|
| @@ -124,6 +133,10 @@ class ASH_EXPORT TabletPowerButtonController
|
| // released. Runs OnShutdownTimeout() to start shutdown.
|
| base::OneShotTimer shutdown_timer_;
|
|
|
| + // Used to provide a grace period between forcing the display off and locking
|
| + // the screen. Runs OnLockScreenTimeout().
|
| + base::OneShotTimer lock_screen_timer_;
|
| +
|
| LockStateController* controller_; // Not owned.
|
|
|
| base::WeakPtrFactory<TabletPowerButtonController> weak_ptr_factory_;
|
|
|