Index: ui/views/corewm/window_animations.cc |
diff --git a/ui/views/corewm/window_animations.cc b/ui/views/corewm/window_animations.cc |
index d5d4da7f3cf2822936f71b457d708e2294e191eb..1f90b40a62a0994485274204cad998837210a7d5 100644 |
--- a/ui/views/corewm/window_animations.cc |
+++ b/ui/views/corewm/window_animations.cc |
@@ -358,10 +358,8 @@ void AnimateBounce(aura::Window* window) { |
scoped_ptr<ui::LayerAnimationSequence> sequence( |
new ui::LayerAnimationSequence); |
sequence->AddElement(CreateGrowShrinkElement(window, true)); |
- ui::LayerAnimationElement::AnimatableProperties paused_properties; |
- paused_properties.insert(ui::LayerAnimationElement::BOUNDS); |
sequence->AddElement(ui::LayerAnimationElement::CreatePauseElement( |
- paused_properties, |
+ ui::LayerAnimationElement::BOUNDS, |
base::TimeDelta::FromMilliseconds( |
kWindowAnimation_Bounce_DurationMS * |
(100 - 2 * kWindowAnimation_Bounce_GrowShrinkDurationPercent) / |
@@ -382,8 +380,7 @@ void AddLayerAnimationsForRotate(aura::Window* window, bool show) { |
new HidingWindowAnimationObserver(window); |
window->layer()->GetAnimator()->SchedulePauseForProperties( |
duration * (100 - kWindowAnimation_Rotate_OpacityDurationPercent) / 100, |
- ui::LayerAnimationElement::OPACITY, |
- -1); |
+ ui::LayerAnimationElement::OPACITY); |
} |
scoped_ptr<ui::LayerAnimationElement> opacity( |
ui::LayerAnimationElement::CreateOpacityElement( |