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/power_button_controller.cc | |
| 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/power_button_controller.cc')
| -rw-r--r-- | ash/wm/power_button_controller.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc index 6850608..c2e3789 100644 --- a/ash/wm/power_button_controller.cc +++ b/ash/wm/power_button_controller.cc @@ -8,15 +8,16 @@ #include "ash/session_state_delegate.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" +#include "ash/wm/lock_state_controller.h" #include "ash/wm/session_state_animator.h" -#include "ash/wm/session_state_controller.h" #include "base/command_line.h" #include "ui/aura/root_window.h" #include "ui/views/corewm/compound_event_filter.h" namespace ash { -PowerButtonController::PowerButtonController(SessionStateController* controller) +PowerButtonController::PowerButtonController( + LockStateController* controller) : power_button_down_(false), lock_button_down_(false), screen_is_off_(false), |