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

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 7d6392e940fff0225574ec428722ae0c54a06b29..5fe0d5c189617d8434fee88cb7e20c0bf8cec99a 100644
--- a/ui/compositor/layer_animator.h
+++ b/ui/compositor/layer_animator.h
@@ -13,18 +13,18 @@
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
-#include "ui/base/animation/animation_container_element.h"
-#include "ui/base/animation/tween.h"
 #include "ui/compositor/compositor_export.h"
 #include "ui/compositor/layer_animation_element.h"
+#include "ui/gfx/animation/animation_container_element.h"
+#include "ui/gfx/animation/tween.h"
 
 namespace gfx {
+class Animation;
 class Rect;
 class Transform;
 }
 
 namespace ui {
-class Animation;
 class Layer;
 class LayerAnimationSequence;
 class LayerAnimationDelegate;
@@ -41,7 +41,8 @@ class ScopedLayerAnimationSettings;
 // by holding a reference to itself for the duration of methods for which it
 // must guarantee that |this| is valid.
 class COMPOSITOR_EXPORT LayerAnimator
-    : public AnimationContainerElement, public base::RefCounted<LayerAnimator> {
+    : public gfx::AnimationContainerElement,
+      public base::RefCounted<LayerAnimator> {
  public:
   enum PreemptionStrategy {
     IMMEDIATELY_SET_NEW_TARGET,
@@ -171,8 +172,8 @@ class COMPOSITOR_EXPORT LayerAnimator
   // This determines how implicit animations will be tweened. This has no
   // effect on animations that are explicitly started or scheduled. The default
   // is Tween::LINEAR.
-  void set_tween_type(Tween::Type tween_type) { tween_type_ = tween_type; }
-  Tween::Type tween_type() const { return tween_type_; }
+  void set_tween_type(gfx::Tween::Type tween_type) { tween_type_ = tween_type; }
+  gfx::Tween::Type tween_type() const { return tween_type_; }
 
   // For testing purposes only.
   void set_disable_timer_for_test(bool disable_timer) {
@@ -320,7 +321,7 @@ class COMPOSITOR_EXPORT LayerAnimator
   base::TimeDelta transition_duration_;
 
   // The default tween type for implicit transitions
-  Tween::Type tween_type_;
+  gfx::Tween::Type tween_type_;
 
   // Used for coordinating the starting of animations.
   base::TimeTicks last_step_time_;