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

chrome/browser/ui/gtk/hover_controller_gtk.cc

 // Copyright (c) 2011 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/hover_controller_gtk.h"
 
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "ui/gfx/gtk_compat.h"
 
@@ skipping 47 matching lines @@
 void HoverControllerGtk::Destroy() {
   gtk_chrome_button_set_hover_state(GTK_CHROME_BUTTON(button_), -1.0);
 
   g_object_set_data(G_OBJECT(button_), kHoverControllerGtkKey, NULL);
   g_object_unref(button_);
   button_ = NULL;
 
   delete this;
 }
 
-void HoverControllerGtk::AnimationProgressed(const ui::Animation* animation) {
+void HoverControllerGtk::AnimationProgressed(const gfx::Animation* animation) {
   if (!button_)
     return;
 
   // Ignore the hover animation if we are throbbing.
   if (animation == &hover_animation_ && throb_animation_.is_animating())
     return;
 
   gtk_chrome_button_set_hover_state(GTK_CHROME_BUTTON(button_),
                                     animation->GetCurrentValue());
 }
 
-void HoverControllerGtk::AnimationEnded(const ui::Animation* animation) {
+void HoverControllerGtk::AnimationEnded(const gfx::Animation* animation) {
   if (!button_)
     return;
   if (animation != &throb_animation_)
     return;
 
   if (throb_animation_.cycles_remaining() <= 1)
     gtk_chrome_button_set_hover_state(GTK_CHROME_BUTTON(button_), 0);
 }
 
-void HoverControllerGtk::AnimationCanceled(const ui::Animation* animation) {
+void HoverControllerGtk::AnimationCanceled(const gfx::Animation* animation) {
   AnimationEnded(animation);
 }
 
 gboolean HoverControllerGtk::OnEnter(GtkWidget* widget,
                                      GdkEventCrossing* event) {
   hover_animation_.Show();
 
   return FALSE;
 }
 
@@ skipping 17 matching lines @@
   if (!gtk_widget_is_toplevel(gtk_widget_get_toplevel(widget))) {
     gtk_widget_set_state(button_, GTK_STATE_NORMAL);
     hover_animation_.Reset();
     gtk_chrome_button_set_hover_state(GTK_CHROME_BUTTON(button_), 0.0);
   }
 }
 
 void HoverControllerGtk::OnDestroy(GtkWidget* widget) {
   Destroy();
 }