Index: ash/wm/window_animations.cc |
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc |
index 5d02758d0b6c9f324d1b49905b970b454a3e88a9..0daa4f346baf1dda679e57921a0b22d7eae275a1 100644 |
--- a/ash/wm/window_animations.cc |
+++ b/ash/wm/window_animations.cc |
@@ -105,8 +105,8 @@ void AddLayerAnimationsForMinimize(aura::Window* window, bool show) { |
rotation_about_pivot->SetReversed(show); |
- base::TimeDelta duration = base::TimeDelta::FromMilliseconds( |
- kLayerAnimationsForMinimizeDurationMS); |
+ base::TimeDelta duration = window->layer()->GetAnimator()-> |
+ GetTransitionDuration(); |
scoped_ptr<ui::LayerAnimationElement> transition( |
ui::LayerAnimationElement::CreateInterpolatedTransformElement( |
@@ -136,6 +136,10 @@ void AddLayerAnimationsForMinimize(aura::Window* window, bool show) { |
void AnimateShowWindow_Minimize(aura::Window* window) { |
window->layer()->set_delegate(window); |
window->layer()->SetOpacity(kWindowAnimation_HideOpacity); |
+ ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator()); |
+ base::TimeDelta duration = base::TimeDelta::FromMilliseconds( |
+ kLayerAnimationsForMinimizeDurationMS); |
+ settings.SetTransitionDuration(duration); |
AddLayerAnimationsForMinimize(window, true); |
// Now that the window has been restored, we need to clear its animation style |