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

chrome/browser/ui/gtk/tabs/tab_renderer_gtk.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_TABS_TAB_RENDERER_GTK_H_
 #define CHROME_BROWSER_UI_GTK_TABS_TAB_RENDERER_GTK_H_
 
 #include <gtk/gtk.h>
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/animation/animation_delegate.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/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/rect.h"
 
 namespace gfx {
 class CairoCachedSurface;
 class Image;
 class Size;
+class SlideAnimation;
+class ThrobAnimation;
 }  // namespace gfx
 
 class CustomDrawButton;
 class GtkThemeService;
 
 namespace content {
 class WebContents;
 }
 
-namespace ui {
-class SlideAnimation;
-class ThrobAnimation;
-}
-
-class TabRendererGtk : public ui::AnimationDelegate,
+class TabRendererGtk : public gfx::AnimationDelegate,
                        public content::NotificationObserver {
  public:
   // Possible animation states.
   enum AnimationState {
     ANIMATION_NONE,
     ANIMATION_WAITING,
     ANIMATION_LOADING
   };
 
   class LoadingAnimation : public content::NotificationObserver {
@@ skipping 206 matching lines @@
     bool crashed;
     bool incognito;
     bool show_icon;
     bool mini;
     bool blocked;
     bool animating_mini_change;
     bool app;
     CaptureState capture_state;
   };
 
-  // Overridden from ui::AnimationDelegate:
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
+  // Overridden from gfx::AnimationDelegate:
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
 
   // Starts/Stops the crash animation.
   void StartCrashAnimation();
   void StopCrashAnimation();
 
   // Return true if the crash animation is currently running.
   bool IsPerformingCrashAnimation() const;
 
   // Set the temporary offset for the favicon. This is used during animation.
   void SetFaviconHidingOffset(int offset);
@@ skipping 116 matching lines @@
   bool should_display_crashed_favicon_;
 
   // The bounds of this Tab.
   gfx::Rect bounds_;
 
   // The requested bounds of this tab.  These bounds are relative to the
   // tabstrip.
   gfx::Rect requisition_;
 
   // Hover animation.
-  scoped_ptr<ui::SlideAnimation> hover_animation_;
+  scoped_ptr<gfx::SlideAnimation> hover_animation_;
 
   // Animation used when the title of an inactive mini-tab changes.
-  scoped_ptr<ui::ThrobAnimation> mini_title_animation_;
+  scoped_ptr<gfx::ThrobAnimation> mini_title_animation_;
 
   // Animation used when the favicon has an overlay (e.g. for recording).
-  scoped_ptr<ui::ThrobAnimation> favicon_overlay_animation_;
+  scoped_ptr<gfx::ThrobAnimation> favicon_overlay_animation_;
 
   // Contains the loading animation state.
   LoadingAnimation loading_animation_;
 
   // The offset used to paint the tab theme images.
   int background_offset_x_;
 
   // The vertical offset used to paint the tab theme images. Controlled by the
   // tabstrip and plumbed here to offset the theme image by the size of the
   // alignment in the BrowserTitlebar.
@@ skipping 13 matching lines @@
   // Color of the title text on the selected tab.
   SkColor selected_title_color_;
 
   // Color of the title text on an unselected tab.
   SkColor unselected_title_color_;
 
   DISALLOW_COPY_AND_ASSIGN(TabRendererGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_TABS_TAB_RENDERER_GTK_H_