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

ui/views/controls/glow_hover_controller.cc

 // 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.
 
 #include "ui/views/controls/glow_hover_controller.h"
 
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
@@ skipping 12 matching lines @@
     : view_(view),
       animation_(this),
       opacity_scale_(kTrackOpacityScale) {
   animation_.set_delegate(this);
 }
 
 GlowHoverController::~GlowHoverController() {
 }
 
 void GlowHoverController::SetAnimationContainer(
-    ui::AnimationContainer* container) {
+    gfx::AnimationContainer* container) {
   animation_.SetContainer(container);
 }
 
 void GlowHoverController::SetLocation(const gfx::Point& location) {
   location_ = location;
   if (ShouldDraw())
     view_->SchedulePaint();
 }
 
 void GlowHoverController::Show(Style style) {
   switch (style) {
     case SUBTLE:
       opacity_scale_ = kTrackOpacityScale;
       animation_.SetSlideDuration(kTrackHoverDurationMs);
-      animation_.SetTweenType(ui::Tween::EASE_OUT);
+      animation_.SetTweenType(gfx::Tween::EASE_OUT);
       animation_.Show();
       break;
     case PRONOUNCED:
       opacity_scale_ = kHighlightOpacityScale;
       // Force the end state to show immediately.
       animation_.Show();
       animation_.End();
       break;
   }
 }
 
 void GlowHoverController::Hide() {
-  animation_.SetTweenType(ui::Tween::EASE_IN);
+  animation_.SetTweenType(gfx::Tween::EASE_IN);
   animation_.Hide();
 }
 
 void GlowHoverController::HideImmediately() {
   if (ShouldDraw())
     view_->SchedulePaint();
   animation_.Reset();
 }
 
 double GlowHoverController::GetAnimationValue() const {
@@ skipping 38 matching lines @@
     hover_canvas.DrawRect(gfx::Rect(location_.x() - radius,
                                     location_.y() - radius,
                                     radius * 2, radius * 2), paint);
   }
   gfx::ImageSkia result = gfx::ImageSkiaOperations::CreateMaskedImage(
       gfx::ImageSkia(hover_canvas.ExtractImageRep()), mask_image);
   canvas->DrawImageInt(result, (view_->width() - mask_image.width()) / 2,
                        (view_->height() - mask_image.height()) / 2);
 }
 
-void GlowHoverController::AnimationEnded(const ui::Animation* animation) {
+void GlowHoverController::AnimationEnded(const gfx::Animation* animation) {
   view_->SchedulePaint();
 }
 
-void GlowHoverController::AnimationProgressed(const ui::Animation* animation) {
+void GlowHoverController::AnimationProgressed(const gfx::Animation* animation) {
   view_->SchedulePaint();
 }
 
 }  // namespace views