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

ash/system/tray/tray_item_view.cc

Index: ash/system/tray/tray_item_view.cc
diff --git a/ash/system/tray/tray_item_view.cc b/ash/system/tray/tray_item_view.cc
index f95ceb935708c20e5b509c1e88b2a47ea74a8f4f..da8051b77bce8cc6d0b7d2dd855d81729244b3fc 100644
--- a/ash/system/tray/tray_item_view.cc
+++ b/ash/system/tray/tray_item_view.cc
@@ -7,8 +7,8 @@
 #include "ash/shelf/shelf_types.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_item.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/compositor/layer.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
@@ -60,9 +60,9 @@ void TrayItemView::SetVisible(bool set_visible) {
   }
 
   if (!animation_) {
-    animation_.reset(new ui::SlideAnimation(this));
+    animation_.reset(new gfx::SlideAnimation(this));
     animation_->SetSlideDuration(GetAnimationDurationMS());
-    animation_->SetTweenType(ui::Tween::LINEAR);
+    animation_->SetTweenType(gfx::Tween::LINEAR);
     animation_->Reset(visible() ? 1.0 : 0.0);
   }
 
@@ -106,7 +106,7 @@ void TrayItemView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
-void TrayItemView::AnimationProgressed(const ui::Animation* animation) {
+void TrayItemView::AnimationProgressed(const gfx::Animation* animation) {
   gfx::Transform transform;
   transform.Translate(0, animation->CurrentValueBetween(
       static_cast<double>(height()) / 2, 0.));
@@ -116,12 +116,12 @@ void TrayItemView::AnimationProgressed(const ui::Animation* animation) {
   PreferredSizeChanged();
 }
 
-void TrayItemView::AnimationEnded(const ui::Animation* animation) {
+void TrayItemView::AnimationEnded(const gfx::Animation* animation) {
   if (animation->GetCurrentValue() < 0.1)
     views::View::SetVisible(false);
 }
 
-void TrayItemView::AnimationCanceled(const ui::Animation* animation) {
+void TrayItemView::AnimationCanceled(const gfx::Animation* animation) {
   AnimationEnded(animation);
 }