Changes sequence of docked animations when evicting windows from dock.

ui/compositor/scoped_layer_animation_settings.h

Index: ui/compositor/scoped_layer_animation_settings.h
diff --git a/ui/compositor/scoped_layer_animation_settings.h b/ui/compositor/scoped_layer_animation_settings.h
index e36b853272990789e6b0def70c52ea54c8529126..9c3198431de4ee826ff6c9e433909feb5f9e7855 100644
--- a/ui/compositor/scoped_layer_animation_settings.h
+++ b/ui/compositor/scoped_layer_animation_settings.h
@@ -34,6 +34,13 @@ class COMPOSITOR_EXPORT ScopedLayerAnimationSettings {
   void SetTransitionDuration(base::TimeDelta duration);
   base::TimeDelta GetTransitionDuration() const;
 
+  // Lock transition duration in |animator_|. When transition duration
+  // is locked any subsequent changes to it are ignored until the
+  // ScopedLayerAnimationSettings object that has locked the duration goes out
+  // of scope or until some ScopedLayerAnimationSettings object unlocks the
+  // transition duration.
+  void SetTransitionDurationLocked(bool is_locked);

[Ian Vollick, 2013/11/29 04:33:31]

How would you feel about changing this to void LockTransitionDuration()? It
seems scary to me that at an inner scope we might just unlock the locked
duration. It seems safer to me if the only thing that could unlock the duration
is the SLAS destructor.

[varkha, 2013/11/29 06:05:54]

Done. I like it - less things to test.

+
   void SetTweenType(gfx::Tween::Type tween_type);
   gfx::Tween::Type GetTweenType() const;
 
@@ -50,6 +57,8 @@ class COMPOSITOR_EXPORT ScopedLayerAnimationSettings {
 
  private:
   LayerAnimator* animator_;
+  bool is_transition_duration_locked_;
+  bool old_is_transition_duration_locked_;
   base::TimeDelta old_transition_duration_;
   gfx::Tween::Type old_tween_type_;
   LayerAnimator::PreemptionStrategy old_preemption_strategy_;