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/shell.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/shell.cc')
| -rw-r--r-- | ash/shell.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 0f12d3f..365df5b 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -50,15 +50,15 @@ #include "ash/wm/custom_frame_view_ash.h" #include "ash/wm/event_client_impl.h" #include "ash/wm/event_rewriter_event_filter.h" +#include "ash/wm/lock_state_controller.h" +#include "ash/wm/lock_state_controller_impl2.h" #include "ash/wm/overlay_event_filter.h" #include "ash/wm/power_button_controller.h" #include "ash/wm/property_util.h" #include "ash/wm/resize_shadow_controller.h" #include "ash/wm/root_window_layout_manager.h" #include "ash/wm/screen_dimmer.h" -#include "ash/wm/session_state_controller.h" #include "ash/wm/session_state_controller_impl.h" -#include "ash/wm/session_state_controller_impl2.h" #include "ash/wm/system_gesture_event_filter.h" #include "ash/wm/system_modal_container_event_filter.h" #include "ash/wm/system_modal_container_layout_manager.h" @@ -298,7 +298,7 @@ Shell::~Shell() { video_detector_.reset(); power_button_controller_.reset(); - session_state_controller_.reset(); + lock_state_controller_.reset(); mirror_window_controller_.reset(); @@ -530,12 +530,12 @@ void Shell::Init() { delegate_->IsFirstRunAfterBoot()); if (command_line->HasSwitch(ash::switches::kAshDisableNewLockAnimations)) - session_state_controller_.reset(new SessionStateControllerImpl); + lock_state_controller_.reset(new SessionStateControllerImpl); else - session_state_controller_.reset(new SessionStateControllerImpl2); + lock_state_controller_.reset(new LockStateControllerImpl2); power_button_controller_.reset(new PowerButtonController( - session_state_controller_.get())); - AddShellObserver(session_state_controller_.get()); + lock_state_controller_.get())); + AddShellObserver(lock_state_controller_.get()); mouse_cursor_filter_.reset(new internal::MouseCursorEventFilter()); AddPreTargetHandler(mouse_cursor_filter_.get()); |