diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 19:07:47 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 19:07:47 +0000 |
| commit | ab4f8c99b9d0f31e9c4ea22307527b1fabaabcf6 (patch) | |
| tree | d9679fec01cc30162b78df225f739b649186212f /ash/wm/session_state_controller_impl.h | |
| parent | 43fb70012595f295078e3957a083590a1ee25c6d (diff) | |
| download | chromium_src-ab4f8c99b9d0f31e9c4ea22307527b1fabaabcf6.zip chromium_src-ab4f8c99b9d0f31e9c4ea22307527b1fabaabcf6.tar.gz chromium_src-ab4f8c99b9d0f31e9c4ea22307527b1fabaabcf6.tar.bz2 | |
Rename SessionStateController -> LockStateController.
Now that we have SessionStateDelegate which covers more aspects of the session than just lock/unlock/shut down animations makes sense to rename lock animation related classes.
SessionStateController -> LockStateController
SessionStateControllerImpl2 > LockStateControllerImpl2
SessionStateObserver > LockStateObserver
SessionStateObserver will be used as observer for SessionStateDelegate for things like active user changed etc.
NOT renaming SessionStateControllerImpl since it is a legacy implementation and will removed soon.
BUG=180903
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/15974008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/session_state_controller_impl.h')
| -rw-r--r-- | ash/wm/session_state_controller_impl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/wm/session_state_controller_impl.h b/ash/wm/session_state_controller_impl.h index cab27b3..79a5c2c 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/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 LockStateController { 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; |