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

ash/system/tray/tray_item_view.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 "ash/system/tray/tray_item_view.h"
 
 #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"
 #include "ui/views/widget/widget.h"
 
 namespace {
 const int kTrayIconHeight = 29;
 const int kTrayIconWidth = 29;
 const int kTrayItemAnimationDurationMS = 200;
 
@@ skipping 31 matching lines @@
   AddChildView(image_view_);
 }
 
 void TrayItemView::SetVisible(bool set_visible) {
   if (!GetWidget() || !animations_enabled) {
     views::View::SetVisible(set_visible);
     return;
   }
 
   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);
   }
 
   if (!set_visible) {
     animation_->Hide();
     AnimationProgressed(animation_.get());
   } else {
     animation_->Show();
     AnimationProgressed(animation_.get());
     views::View::SetVisible(true);
@@ skipping 23 matching lines @@
 }
 
 int TrayItemView::GetHeightForWidth(int width) {
   return GetPreferredSize().height();
 }
 
 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.));
   transform.Scale(animation->GetCurrentValue(),
                   animation->GetCurrentValue());
   layer()->SetTransform(transform);
   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);
 }
 
 }  // namespace internal
 }  // namespace ash