ash/shell.cc - Issue 24980006: ash: Remove old lock animation implementation.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shell.cc

Issue 24980006: ash: Remove old lock animation implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove StartShutdownAnimationImpl() and duplicate include Created 7 years, 3 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:

Index: ash/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc

index 3606c5d78155195cbeab2317cb4a14424ffb210e..afcc4c4db6cbf1606dbba5a6dde718419879cdd7 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -54,7 +54,6 @@

#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/mru_window_tracker.h"

#include "ash/wm/overlay_event_filter.h"

#include "ash/wm/overview/window_selector_controller.h"

@@ -62,7 +61,6 @@

#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_impl.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"

@@ -527,10 +525,7 @@ void Shell::Init() {

if (keyboard::IsKeyboardEnabled())

keyboard::InitializeKeyboard();

- if (command_line->HasSwitch(ash::switches::kAshDisableNewLockAnimations))

- lock_state_controller_.reset(new SessionStateControllerImpl);

- else

- lock_state_controller_.reset(new LockStateControllerImpl2);

+ lock_state_controller_.reset(new LockStateController);

power_button_controller_.reset(new PowerButtonController(

lock_state_controller_.get()));

AddShellObserver(lock_state_controller_.get());