ui/base/animation -> ui/gfx/animation

ui/compositor/layer_animation_element.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_
 #define UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_
 
 #include <set>
 
 #include "base/time/time.h"
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_events.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/animation/tween.h"
 #include "ui/compositor/compositor_export.h"
+#include "ui/gfx/animation/tween.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
 
 namespace ui {
 
 class InterpolatedTransform;
 class LayerAnimationDelegate;
 
 // LayerAnimationElements represent one segment of an animation between two
 // keyframes. They know how to update a LayerAnimationDelegate given a value
@@ skipping 149 matching lines @@
 
   // Assigns the target value to |target|.
   void GetTargetValue(TargetValue* target) const;
 
   // The properties that the element modifies.
   const AnimatableProperties& properties() const { return properties_; }
 
   // Whether this element animates on the compositor thread.
   virtual bool IsThreaded() const;
 
-  Tween::Type tween_type() const { return tween_type_; }
-  void set_tween_type(Tween::Type tween_type) { tween_type_ = tween_type; }
+  gfx::Tween::Type tween_type() const { return tween_type_; }
+  void set_tween_type(gfx::Tween::Type tween_type) { tween_type_ = tween_type; }
 
   // Each LayerAnimationElement has a unique animation_id. Elements belonging
   // to sequences that are supposed to start together have the same
   // animation_group_id.
   int animation_id() const { return animation_id_; }
   int animation_group_id() const { return animation_group_id_; }
   void set_animation_group_id(int id) { animation_group_id_ = id; }
 
   base::TimeDelta duration() const { return duration_; }
 
@@ skipping 20 matching lines @@
   // useful to slow animations down to see them more clearly.
   base::TimeDelta GetEffectiveDuration(const base::TimeDelta& delta);
 
   bool first_frame_;
   const AnimatableProperties properties_;
   base::TimeTicks requested_start_time_;
 
   // When the animation actually started, taking into account queueing delays.
   base::TimeTicks effective_start_time_;
   const base::TimeDelta duration_;
-  Tween::Type tween_type_;
+  gfx::Tween::Type tween_type_;
 
   const int animation_id_;
   int animation_group_id_;
 
   double last_progressed_fraction_;
 
   DISALLOW_ASSIGN(LayerAnimationElement);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_