Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2973)

Unified Diff: ash/shell.cc

Issue 15974008: Rename SessionStateController -> LockStateController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.h ('k') | ash/wm/lock_state_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 0f12d3f7cbcf39013129b5fa9eca1d536202ee3f..365df5bf0a2e248b2bb4176599e336d18d12c415 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());
« no previous file with comments | « ash/shell.h ('k') | ash/wm/lock_state_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698