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

chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.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 "chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/translate/options_menu_model.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/infobars/after_translate_infobar_gtk.h"
 #include "chrome/browser/ui/gtk/infobars/before_translate_infobar_gtk.h"
 #include "chrome/browser/ui/gtk/infobars/translate_message_infobar_gtk.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "grit/generated_resources.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_signal_registrar.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 
 
 // TranslateInfoBarDelegate ---------------------------------------------------
 
 InfoBar* TranslateInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
   if (infobar_type_ == BEFORE_TRANSLATE)
     return new BeforeTranslateInfoBar(owner, this);
   if (infobar_type_ == AFTER_TRANSLATE)
     return new AfterTranslateInfoBar(owner, this);
   return new TranslateMessageInfoBar(owner, this);
 }
 
 
 // TranslateInfoBarBase -------------------------------------------------------
 
 TranslateInfoBarBase::TranslateInfoBarBase(InfoBarService* owner,
                                            TranslateInfoBarDelegate* delegate)
     : InfoBarGtk(owner, delegate),
       background_error_percent_(0) {
   DCHECK(delegate);
   TranslateInfoBarDelegate::BackgroundAnimationType animation =
       delegate->background_animation_type();
   if (animation != TranslateInfoBarDelegate::NONE) {
-    background_color_animation_.reset(new ui::SlideAnimation(this));
-    background_color_animation_->SetTweenType(ui::Tween::LINEAR);
+    background_color_animation_.reset(new gfx::SlideAnimation(this));
+    background_color_animation_->SetTweenType(gfx::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();
     }
   } else {
     background_error_percent_ = delegate->is_error() ? 1 : 0;
   }
 }
 
 TranslateInfoBarBase::~TranslateInfoBarBase() {
 }
 
-void TranslateInfoBarBase::AnimationProgressed(const ui::Animation* animation) {
+void TranslateInfoBarBase::AnimationProgressed(
+    const gfx::Animation* animation) {
   DCHECK(widget());
   if (animation == background_color_animation_.get()) {
     background_error_percent_ = animation->GetCurrentValue();
     // Queue the info bar widget for redisplay so it repaints its background.
     gtk_widget_queue_draw(widget());
   } else {
     InfoBar::AnimationProgressed(animation);
   }
 }
 
@@ skipping 120 matching lines @@
 }
 
 TranslateInfoBarDelegate* TranslateInfoBarBase::GetDelegate() {
   return static_cast<TranslateInfoBarDelegate*>(delegate());
 }
 
 void TranslateInfoBarBase::OnOptionsClicked(GtkWidget* sender) {
   menu_model_.reset(new OptionsMenuModel(GetDelegate()));
   ShowMenuWithModel(sender, NULL, menu_model_.get());
 }