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

Unified Diff: ash/wm/window_animations.cc

Issue 10960034: [cros] Go back to EASE_OUT for boot transition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build Created 8 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash_switches.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_animations.cc
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 9133b57d2c3a6135255e17bdaf111124600ba285..f99ddcc58133ea1f415fc8e7391cf561c57d041b 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -512,10 +512,13 @@ void AnimateShowHideWindowCommon_BrightnessGrayscale(aura::Window* window,
}
int animation_duration = kBrightnessGrayscaleFadeDurationMs;
- ui::Tween::Type animation_type = ui::Tween::EASE_OUT_2;
+ ui::Tween::Type animation_type = ui::Tween::EASE_OUT;
if (CommandLine::ForCurrentProcess()->HasSwitch(
- ash::switches::kAshDisableBootAnimation2)) {
- animation_type = ui::Tween::EASE_OUT;
+ ash::switches::kAshBootAnimationFunction2)) {
+ animation_type = ui::Tween::EASE_OUT_2;
+ } else if (CommandLine::ForCurrentProcess()->HasSwitch(
+ ash::switches::kAshBootAnimationFunction3)) {
+ animation_type = ui::Tween::EASE_OUT_3;
}
ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator());
« no previous file with comments | « ash/ash_switches.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698