commit 839667d6754a9b4bd2a5b3dfd8b23752a643c343
author antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Oct 23 19:38:57 2012
committer antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Oct 23 19:38:57 2012
tree 99e42c4838bb152b6546469651100697f518be9e
parent 2be16336fbbaec2aa8faa5ce0d0f4bb344687969

Second SessionStateController implementation (just a copy), command-line switches, removed CancelLockWithOtherAnimation(), several constant renames in SessionStateAnimator.

Includes https://codereview.chromium.org/11238058/ fix.

BUG=138171, 139461

Review URL: https://chromiumcodereview.appspot.com/11230050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163645 0039d316-1c4b-4281-b951-d872f2087c98

ash/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc
index 767ea943..775e682 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -46,6 +46,8 @@
 #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/shadow_controller.h"
 #include "ash/wm/stacking_controller.h"
 #include "ash/wm/system_gesture_event_filter.h"
@@ -490,7 +492,10 @@
   // the correct size.
   user_wallpaper_delegate_->InitializeWallpaper();
 
-  session_state_controller_.reset(new SessionStateController);
+  if (command_line->HasSwitch(ash::switches::kAshNewLockAnimationsEnabled))
+    session_state_controller_.reset(new SessionStateControllerImpl2);
+  else
+    session_state_controller_.reset(new SessionStateControllerImpl);
   power_button_controller_.reset(new PowerButtonController(
       session_state_controller_.get()));
   AddShellObserver(session_state_controller_.get());