Move animation code to new ui/base/animation directory....

chrome/browser/ui/views/infobars/translate_infobar_base.cc

 // Copyright (c) 2010 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 "chrome/browser/views/infobars/translate_infobar_base.h"
 
 #include "app/resource_bundle.h"
-#include "app/slide_animation.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/views/infobars/after_translate_infobar.h"
 #include "chrome/browser/views/infobars/before_translate_infobar.h"
 #include "chrome/browser/views/infobars/translate_message_infobar.h"
 #include "chrome/browser/views/infobars/infobar_button_border.h"
 #include "gfx/canvas_skia.h"
 #include "grit/theme_resources.h"
+#include "ui/base/animation/slide_animation.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/image_view.h"
 
 TranslateInfoBarBase::TranslateInfoBarBase(
     TranslateInfoBarDelegate* delegate)
     : InfoBar(delegate),
       normal_background_(InfoBarDelegate::PAGE_ACTION_TYPE),
       error_background_(InfoBarDelegate::WARNING_TYPE) {
   icon_ = new views::ImageView;
   SkBitmap* image = delegate->GetIcon();
   if (image)
     icon_->SetImage(image);
   AddChildView(icon_);
 
   TranslateInfoBarDelegate::BackgroundAnimationType animation =
       delegate->background_animation_type();
   if (animation != TranslateInfoBarDelegate::NONE) {
-    background_color_animation_.reset(new SlideAnimation(this));
-    background_color_animation_->SetTweenType(Tween::LINEAR);
+    background_color_animation_.reset(new ui::SlideAnimation(this));
+    background_color_animation_->SetTweenType(ui::Tween::LINEAR);
     background_color_animation_->SetSlideDuration(500);
     if (animation == TranslateInfoBarDelegate::NORMAL_TO_ERROR) {
       background_color_animation_->Show();
     } else {
       DCHECK_EQ(TranslateInfoBarDelegate::ERROR_TO_NORMAL, animation);
       // Hide() runs the animation in reverse.
       background_color_animation_->Reset(1.0);
       background_color_animation_->Hide();
     }
   }
@@ skipping 28 matching lines @@
     GetBackground().Paint(canvas, this);
     return;
   }
 
   FadeBackground(canvas, 1.0 - background_color_animation_->GetCurrentValue(),
                  normal_background_);
   FadeBackground(canvas, background_color_animation_->GetCurrentValue(),
                  error_background_);
 }
 
-void TranslateInfoBarBase::AnimationProgressed(const Animation* animation) {
+void TranslateInfoBarBase::AnimationProgressed(const ui::Animation* animation) {
   if (background_color_animation_.get() == animation)
     SchedulePaint();  // That'll trigger a PaintBackgroud.
   else
     InfoBar::AnimationProgressed(animation);
 }
 
 views::MenuButton* TranslateInfoBarBase::CreateMenuButton(
     const string16& text,
     bool normal_has_border,
     views::ViewMenuDelegate* menu_delegate) {
@@ skipping 74 matching lines @@
       infobar = new TranslateMessageInfoBar(this);
       break;
     default:
       NOTREACHED();
   }
   // Set |infobar_view_| so that the model can notify the infobar when it
   // changes.
   infobar_view_ = infobar;
   return infobar;
 }