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

content/browser/web_contents/aura/window_slider.cc

Index: content/browser/web_contents/aura/window_slider.cc
diff --git a/content/browser/web_contents/aura/window_slider.cc b/content/browser/web_contents/aura/window_slider.cc
index a4bd5524fa5f25685df05c7cc532a4a89da0f9ff..faa4691e50e9f6c8d331e987b98fd69c41b66a59 100644
--- a/content/browser/web_contents/aura/window_slider.cc
+++ b/content/browser/web_contents/aura/window_slider.cc
@@ -166,7 +166,7 @@ void WindowSlider::UpdateForFling(float x_velocity, float y_velocity) {
   ui::ScopedLayerAnimationSettings settings(sliding->GetAnimator());
   settings.SetPreemptionStrategy(
       ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
-  settings.SetTweenType(ui::Tween::EASE_OUT);
+  settings.SetTweenType(gfx::Tween::EASE_OUT);
   settings.AddObserver(new CallbackAnimationObserver(
       base::Bind(&WindowSlider::CompleteWindowSlideAfterAnimation,
                  weak_factory_.GetWeakPtr())));
@@ -190,7 +190,7 @@ void WindowSlider::ResetScroll() {
     ui::ScopedLayerAnimationSettings settings(layer->GetAnimator());
     settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
-    settings.SetTweenType(ui::Tween::EASE_OUT);
+    settings.SetTweenType(gfx::Tween::EASE_OUT);
 
     // Delete the layer and the shadow at the end of the animation.
     settings.AddObserver(new CallbackAnimationObserver(
@@ -208,7 +208,7 @@ void WindowSlider::ResetScroll() {
     ui::ScopedLayerAnimationSettings settings(owner_->layer()->GetAnimator());
     settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
-    settings.SetTweenType(ui::Tween::EASE_OUT);
+    settings.SetTweenType(gfx::Tween::EASE_OUT);
     settings.AddObserver(new CallbackAnimationObserver(
         base::Bind(&WindowSlider::AbortWindowSlideAfterAnimation,
                    weak_factory_.GetWeakPtr())));