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

content/browser/web_contents/aura/window_slider.cc

 // Copyright (c) 2013 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.
 
 #include "content/browser/web_contents/aura/window_slider.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 148 matching lines @@
   float ratio = (fabs(delta_x_) - active_start_threshold_) / width;
   if (ratio < complete_threshold_) {
     ResetScroll();
     return;
   }
 
   ui::Layer* sliding = delta_x_ < 0 ? slider_.get() : owner_->layer();
   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())));
 
   gfx::Transform transform;
   transform.Translate(delta_x_ < 0 ? 0 : width, 0);
   sliding->SetTransform(transform);
 }
 
 void WindowSlider::ResetScroll() {
   if (!slider_.get())
     return;
 
   // Do not trigger any callbacks if this animation replaces any in-progress
   // animation.
   weak_factory_.InvalidateWeakPtrs();
 
   // Reset the state of the sliding layer.
   if (slider_.get()) {
     ui::Layer* layer = slider_.release();
     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(
         base::Bind(&DeleteLayerAndShadow,
                    base::Unretained(layer),
                    base::Unretained(shadow_.release()))));
 
     gfx::Transform transform;
     transform.Translate(delta_x_ < 0 ? layer->bounds().width() : 0, 0);
     layer->SetTransform(transform);
   }
 
   // Reset the state of the main layer.
   {
     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())));
     owner_->layer()->SetTransform(gfx::Transform());
     owner_->layer()->SetLayerBrightness(0.f);
   }
 
   delta_x_ = 0.f;
 }
 
@@ skipping 77 matching lines @@
   } else if (window == owner_) {
     window->RemoveObserver(this);
     owner_ = NULL;
     delete this;
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace content