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

chrome/browser/ui/views/tabs/tab.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_VIEWS_TABS_TAB_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_
 
 #include <list>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/tabs/tab_audio_indicator.h"
 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
-#include "ui/base/animation/animation_delegate.h"
 #include "ui/base/layout.h"
+#include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/point.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/glow_hover_controller.h"
 #include "ui/views/view.h"
 
 class TabController;
 
 namespace gfx {
-class Font;
-}
-namespace ui {
 class Animation;
 class AnimationContainer;
+class Font;
 class LinearAnimation;
 class MultiAnimation;
 }
 namespace views {
 class ImageButton;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 //  A View that renders a Tab, either in a TabStrip or in a DraggedTabView.
 //
 ///////////////////////////////////////////////////////////////////////////////
 class Tab : public TabAudioIndicator::Delegate,
-            public ui::AnimationDelegate,
+            public gfx::AnimationDelegate,
             public views::ButtonListener,
             public views::ContextMenuController,
             public views::View {
  public:
   // The menu button's class name.
   static const char kViewClassName[];
 
   explicit Tab(TabController* controller);
   virtual ~Tab();
 
   TabController* controller() const { return controller_; }
 
   // Used to set/check whether this Tab is being animated closed.
   void set_closing(bool closing) { closing_ = closing; }
   bool closing() const { return closing_; }
 
   // See description above field.
   void set_dragging(bool dragging) { dragging_ = dragging; }
   bool dragging() const { return dragging_; }
 
   // Sets the container all animations run from.
-  void set_animation_container(ui::AnimationContainer* container);
+  void set_animation_container(gfx::AnimationContainer* container);
 
   // Set the theme provider - because we get detached, we are frequently
   // outside of a hierarchy with a theme provider at the top. This should be
   // called whenever we're detached or attached to a hierarchy.
   void set_theme_provider(ui::ThemeProvider* provider) {
     theme_provider_ = provider;
   }
 
   // Returns true if this tab is the active tab.
   bool IsActive() const;
@@ skipping 74 matching lines @@
 
     // The image.
     gfx::ImageSkia image;
   };
 
   typedef std::list<ImageCacheEntry> ImageCache;
 
   // Overridden from TabAudioIndicator::Delegate:
   virtual void ScheduleAudioIndicatorPaint() OVERRIDE;
 
-  // 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;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
   // Overridden from views::ContextMenuController:
   virtual void ShowContextMenuForView(views::View* source,
                                       const gfx::Point& point,
                                       ui::MenuSourceType source_type) OVERRIDE;
 
@@ skipping 29 matching lines @@
   void DataChanged(const TabRendererData& old);
 
   // Paint with the normal tab style.
   void PaintTab(gfx::Canvas* canvas);
 
   // Paint with the "immersive mode" light-bar style.
   void PaintImmersiveTab(gfx::Canvas* canvas);
 
   // Paint various portions of the Tab
   void PaintTabBackground(gfx::Canvas* canvas);
-  void PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas,
-                                                 ui::MultiAnimation* animation);
+  void PaintInactiveTabBackgroundWithTitleChange(
+      gfx::Canvas* canvas,
+      gfx::MultiAnimation* animation);
   void PaintInactiveTabBackground(gfx::Canvas* canvas);
   void PaintInactiveTabBackgroundUsingResourceId(gfx::Canvas* canvas,
                                                  int tab_id);
   void PaintActiveTabBackground(gfx::Canvas* canvas);
 
   // Paints the icon at the specified coordinates, mirrored for RTL if needed.
   void PaintIcon(gfx::Canvas* canvas);
   void PaintCaptureState(gfx::Canvas* canvas, gfx::Rect bounds);
   void PaintTitle(gfx::Canvas* canvas, SkColor title_color);
 
@@ skipping 84 matching lines @@
 
   // Step in the immersive loading progress indicator.
   int immersive_loading_step_;
 
   bool should_display_crashed_favicon_;
 
   // The tab and the icon can both be animating. The tab 'throbs' by changing
   // color. The icon can have one of several of animations like crashing,
   // recording, projecting, etc. Note that the icon animation related to network
   // state does not have an animation associated with it.
-  scoped_ptr<ui::Animation> tab_animation_;
-  scoped_ptr<ui::LinearAnimation> icon_animation_;
+  scoped_ptr<gfx::Animation> tab_animation_;
+  scoped_ptr<gfx::LinearAnimation> icon_animation_;
 
-  scoped_refptr<ui::AnimationContainer> animation_container_;
+  scoped_refptr<gfx::AnimationContainer> animation_container_;
 
   scoped_ptr<TabAudioIndicator> tab_audio_indicator_;
 
   views::ImageButton* close_button_;
 
   ui::ThemeProvider* theme_provider_;
 
   bool tab_activated_with_last_gesture_begin_;
 
   views::GlowHoverController hover_controller_;
@@ skipping 31 matching lines @@
   static int font_height_;
 
   // As the majority of the tabs are inactive, and painting tabs is slowish,
   // we cache a handful of the inactive tab backgrounds here.
   static ImageCache* image_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(Tab);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_