| 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());
|
|
|