| Index: ash/wm/session_state_controller_impl.h
|
| diff --git a/ash/wm/session_state_controller_impl.h b/ash/wm/session_state_controller_impl.h
|
| index cab27b312d35d301aebb77dc46c20e3eec58a178..7b105f43e4652d91aaebbdec719df496a2bb2e63 100644
|
| --- a/ash/wm/session_state_controller_impl.h
|
| +++ b/ash/wm/session_state_controller_impl.h
|
| @@ -7,8 +7,8 @@
|
|
|
| #include "ash/ash_export.h"
|
| #include "ash/shell_observer.h"
|
| +#include "ash/wm/session_lock_state_controller.h"
|
| #include "ash/wm/session_state_animator.h"
|
| -#include "ash/wm/session_state_controller.h"
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/time.h"
|
| @@ -32,7 +32,8 @@ class PowerButtonControllerTest;
|
|
|
| // Displays onscreen animations and locks or suspends the system in response to
|
| // the power button being pressed or released.
|
| -class ASH_EXPORT SessionStateControllerImpl : public SessionStateController {
|
| +class ASH_EXPORT SessionStateControllerImpl :
|
| + public SessionLockStateController {
|
| public:
|
|
|
| // Helper class used by tests to access internal state.
|
| @@ -96,7 +97,7 @@ class ASH_EXPORT SessionStateControllerImpl : public SessionStateController {
|
| virtual void OnAppTerminating() OVERRIDE;
|
| virtual void OnLockStateChanged(bool locked) OVERRIDE;
|
|
|
| - // SessionStateController overrides:
|
| + // SessionLockStateController overrides:
|
| virtual void StartLockAnimation(bool shutdown_after_lock) OVERRIDE;
|
|
|
| virtual void StartShutdownAnimation() OVERRIDE;
|
|
|