Changes sequence of docked animations when evicting windows from dock.

ui/compositor/scoped_layer_animation_settings.cc

Index: ui/compositor/scoped_layer_animation_settings.cc
diff --git a/ui/compositor/scoped_layer_animation_settings.cc b/ui/compositor/scoped_layer_animation_settings.cc
index b5bad673f6074a318fe29e9b0cb37cf52d1b6aea..ea949f78c99fe31a2c57f6d63df90e8bee6d7ec4 100644
--- a/ui/compositor/scoped_layer_animation_settings.cc
+++ b/ui/compositor/scoped_layer_animation_settings.cc
@@ -81,7 +81,10 @@ class InvertingObserver : public ImplicitAnimationObserver {
 ScopedLayerAnimationSettings::ScopedLayerAnimationSettings(
     LayerAnimator* animator)
     : animator_(animator),
-      old_transition_duration_(animator->transition_duration_),
+      is_transition_duration_locked_(animator->is_transition_duration_locked_),
+      old_is_transition_duration_locked_(
+          animator->is_transition_duration_locked_),
+      old_transition_duration_(animator->GetTransitionDuration()),
       old_tween_type_(animator->tween_type()),
       old_preemption_strategy_(animator->preemption_strategy()),
       inverse_observer_(new InvertingObserver()) {
@@ -90,7 +93,9 @@ ScopedLayerAnimationSettings::ScopedLayerAnimationSettings(
 }
 
 ScopedLayerAnimationSettings::~ScopedLayerAnimationSettings() {
-  animator_->transition_duration_ = old_transition_duration_;
+  animator_->is_transition_duration_locked_ =
+      old_is_transition_duration_locked_;
+  animator_->SetTransitionDuration(old_transition_duration_);
   animator_->set_tween_type(old_tween_type_);
   animator_->set_preemption_strategy(old_preemption_strategy_);
 
@@ -113,11 +118,16 @@ void ScopedLayerAnimationSettings::AddObserver(
 
 void ScopedLayerAnimationSettings::SetTransitionDuration(
     base::TimeDelta duration) {
-  animator_->transition_duration_ = duration;
+  animator_->SetTransitionDuration(duration);
+}
+
+void ScopedLayerAnimationSettings::SetTransitionDurationLocked(bool is_locked) {
+  is_transition_duration_locked_ = is_locked;

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

What is SLAS::is_transition_duration_locked_ used for? (Can it be deleted?)

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

Done.

+  animator_->is_transition_duration_locked_ = is_locked;
 }
 
 base::TimeDelta ScopedLayerAnimationSettings::GetTransitionDuration() const {
-  return animator_->transition_duration_;
+  return animator_->GetTransitionDuration();
 }
 
 void ScopedLayerAnimationSettings::SetTweenType(gfx::Tween::Type tween_type) {