Remove unneeded ScopedLayerAnimationSettings::LockTransitionDuration()

ui/compositor/layer_animator.h

Index: ui/compositor/layer_animator.h
diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h
index ad3754de158e8211a1c386c7be1f53464adaa58c..31f1635c2b288dccc999b79cb4b8343a1820868b 100644
--- a/ui/compositor/layer_animator.h
+++ b/ui/compositor/layer_animator.h
@@ -88,10 +88,6 @@ class COMPOSITOR_EXPORT LayerAnimator
   virtual void SetColor(SkColor color);
   SkColor GetTargetColor() const;
 
-  // Returns the default length of animations, including adjustment for slow
-  // animation mode if set.
-  base::TimeDelta GetTransitionDuration() const;
-
   // Sets the layer animation delegate the animator is associated with. The
   // animator does not own the delegate. The layer animator expects a non-NULL
   // delegate for most of its operations, so do not call any methods without
@@ -298,7 +294,11 @@ class COMPOSITOR_EXPORT LayerAnimator
   // starting the animation or adding to the queue.
   void OnScheduled(LayerAnimationSequence* sequence);
 
-  // Sets |transition_duration_| unless |is_transition_duration_locked_| is set.
+  // Returns the default length of animations, including adjustment for slow
+  // animation mode if set.
+  base::TimeDelta GetTransitionDuration() const;

[oshima, 2014/01/08 00:29:13]

maybe we should rename this (and below) to {Get|Set}DefaultTransitionDuration()?
(separate CL is fine)

+
+  // Sets |transition_duration_|.
   void SetTransitionDuration(base::TimeDelta duration);
 
   // Clears the animation queues and notifies any running animations that they
@@ -320,10 +320,6 @@ class COMPOSITOR_EXPORT LayerAnimator
   // Determines how animations are replaced.
   PreemptionStrategy preemption_strategy_;
 
-  // Whether the length of animations is locked. While it is locked
-  // SetTransitionDuration does not set |transition_duration_|.
-  bool is_transition_duration_locked_;
-
   // The default length of animations.
   base::TimeDelta transition_duration_;