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

Unified Diff: ash/shell.cc

Issue 11220002: Add new animations in second implementation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added shutdown animations Created 8 years, 2 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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 2ceb23f41c1f8c013c58250b5bf6d8e8587941b3..1b8eae4dba4740d3b34cea4eafba4c87397ceb49 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -47,6 +47,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"
@@ -492,7 +494,13 @@ void Shell::Init() {
// 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 if (command_line->HasSwitch(
+ ash::switches::kAshNewLockAnimationsDisabled))
+ session_state_controller_.reset(new SessionStateControllerImpl);
+ else // default
+ session_state_controller_.reset(new SessionStateControllerImpl);
power_button_controller_.reset(new PowerButtonController(
session_state_controller_.get()));
AddShellObserver(session_state_controller_.get());

Powered by Google App Engine
This is Rietveld 408576698