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

chrome/browser/ui/views/location_bar/content_setting_image_view.cc

Index: chrome/browser/ui/views/location_bar/content_setting_image_view.cc
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
index 7653be7d04a0deae0a7abe1197342bfdcca86563..3920d7e3400c7361b9025bad7729006d439ff377 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
@@ -86,7 +86,7 @@ ContentSettingImageView::ContentSettingImageView(
   LocationBarView::InitTouchableLocationBarChildView(this);
 
   slide_animator_.SetSlideDuration(kAnimationDurationMS);
-  slide_animator_.SetTweenType(ui::Tween::LINEAR);
+  slide_animator_.SetTweenType(gfx::Tween::LINEAR);
 }
 
 ContentSettingImageView::~ContentSettingImageView() {
@@ -159,7 +159,7 @@ int ContentSettingImageView::GetBubbleOuterPadding(bool by_icon) {
       (by_icon ? 0 : LocationBarView::kIconInternalPadding);
 }
 
-void ContentSettingImageView::AnimationEnded(const ui::Animation* animation) {
+void ContentSettingImageView::AnimationEnded(const gfx::Animation* animation) {
   slide_animator_.Reset();
   if (!pause_animation_) {
     text_label_->SetVisible(false);
@@ -169,7 +169,7 @@ void ContentSettingImageView::AnimationEnded(const ui::Animation* animation) {
 }
 
 void ContentSettingImageView::AnimationProgressed(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   if (!pause_animation_) {
     parent_->Layout();
     parent_->SchedulePaint();
@@ -177,7 +177,7 @@ void ContentSettingImageView::AnimationProgressed(
 }
 
 void ContentSettingImageView::AnimationCanceled(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   AnimationEnded(animation);
 }