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

chrome/browser/ui/gtk/custom_button.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_CUSTOM_BUTTON_H_
 #define CHROME_BROWSER_UI_GTK_CUSTOM_BUTTON_H_
 
 #include <gtk/gtk.h>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/rect.h"
 
 class GtkThemeService;
 class SkBitmap;
 
 namespace gfx {
 class CairoCachedSurface;
 }
 
 // These classes implement two kinds of custom-drawn buttons.  They're
@@ skipping 67 matching lines @@
   // Used to listen for theme change notifications.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomDrawButtonBase);
 };
 
 // CustomDrawHoverController is a convenience class that eases the common task
 // of controlling the hover state of a button. The "hover state" refers to the
 // percent opacity of a button's PRELIGHT. The PRELIGHT is animated such that
 // when a user moves a mouse over a button the PRELIGHT fades in.
-class CustomDrawHoverController : public ui::AnimationDelegate {
+class CustomDrawHoverController : public gfx::AnimationDelegate {
  public:
   explicit CustomDrawHoverController(GtkWidget* widget);
   CustomDrawHoverController();
 
   virtual ~CustomDrawHoverController();
 
   void Init(GtkWidget* widget);
 
   double GetCurrentValue() {
     return slide_animation_.GetCurrentValue();
   }
 
  private:
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
   CHROMEGTK_CALLBACK_1(CustomDrawHoverController, gboolean, OnEnter,
                        GdkEventCrossing*);
   CHROMEGTK_CALLBACK_1(CustomDrawHoverController, gboolean, OnLeave,
                        GdkEventCrossing*);
 
-  ui::SlideAnimation slide_animation_;
+  gfx::SlideAnimation slide_animation_;
   GtkWidget* widget_;
 };
 
 // CustomDrawButton is a plain button where all its various states are drawn
 // with static images. In GTK rendering mode, it will show the standard button
 // with GTK |stock_id|.
 class CustomDrawButton : public content::NotificationObserver {
  public:
   // The constructor takes 4 resource ids.  If a resource doesn't exist for a
   // button, pass in 0.
@@ skipping 96 matching lines @@
   // True if we should never do gtk rendering.
   bool forcing_chrome_theme_;
 
   // Used to listen for theme change notifications.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomDrawButton);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_CUSTOM_BUTTON_H_