ash: Improved window maximize/restore animations

ui/compositor/layer_animator.cc

Index: ui/compositor/layer_animator.cc
diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc
index 712cd2b2b213f1c7c68de0f5acf2792855a0eaaf..c241270a84a633e51a578e9c84e6110592e16dad 100644
--- a/ui/compositor/layer_animator.cc
+++ b/ui/compositor/layer_animator.cc
@@ -47,6 +47,8 @@ LayerAnimator::~LayerAnimator() {
 
 // static
 bool LayerAnimator::disable_animations_for_test_ = false;
+// static
+int LayerAnimator::time_scale_for_test_ = 1;
 
 // static
 LayerAnimator* LayerAnimator::CreateDefaultAnimator() {
@@ -59,7 +61,7 @@ LayerAnimator* LayerAnimator::CreateImplicitAnimator() {
 }
 
 void LayerAnimator::SetTransform(const Transform& transform) {
-  base::TimeDelta duration = transition_duration_;
+  base::TimeDelta duration = transition_duration_ * time_scale_for_test_;
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateTransformElement(transform, duration));
   element->set_tween_type(tween_type_);
@@ -73,7 +75,7 @@ Transform LayerAnimator::GetTargetTransform() const {
 }
 
 void LayerAnimator::SetBounds(const gfx::Rect& bounds) {
-  base::TimeDelta duration = transition_duration_;
+  base::TimeDelta duration = transition_duration_ * time_scale_for_test_;
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateBoundsElement(bounds, duration));
   element->set_tween_type(tween_type_);
@@ -87,7 +89,7 @@ gfx::Rect LayerAnimator::GetTargetBounds() const {
 }
 
 void LayerAnimator::SetOpacity(float opacity) {
-  base::TimeDelta duration = transition_duration_;
+  base::TimeDelta duration = transition_duration_ * time_scale_for_test_;
   scoped_ptr<LayerAnimationElement> element(
       LayerAnimationElement::CreateOpacityElement(opacity, duration));
   element->set_tween_type(tween_type_);
@@ -101,7 +103,7 @@ float LayerAnimator::GetTargetOpacity() const {
 }
 
 void LayerAnimator::SetVisibility(bool visibility) {
-  base::TimeDelta duration = transition_duration_;
+  base::TimeDelta duration = transition_duration_ * time_scale_for_test_;
 
   // Tween type doesn't matter for visibility.
   StartAnimation(new LayerAnimationSequence(