Clean up the tab animations (part 2)

chrome/browser/ui/views/tabs/tab.h

Index: chrome/browser/ui/views/tabs/tab.h
===================================================================
--- chrome/browser/ui/views/tabs/tab.h	(revision 177059)
+++ chrome/browser/ui/views/tabs/tab.h	(working copy)
@@ -25,9 +25,9 @@
 class Font;
 }
 namespace ui {
+class Animation;
 class AnimationContainer;
-class MultiAnimation;
-class ThrobAnimation;
+class LinearAnimation;
 }
 namespace views {
 class ImageButton;
@@ -61,9 +61,6 @@
 
   // Sets the container all animations run from.
   void set_animation_container(ui::AnimationContainer* container);
-  ui::AnimationContainer* animation_container() const {
-    return animation_container_.get();
-  }
 
   // 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
@@ -199,7 +196,8 @@
 
   // Paint various portions of the Tab
   void PaintTabBackground(gfx::Canvas* canvas);
-  void PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas);
+  void PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas,
+                                                 ui::MultiAnimation* animation);
   void PaintInactiveTabBackground(gfx::Canvas* canvas);
   void PaintInactiveTabBackgroundUsingResourceId(gfx::Canvas* canvas,
                                                  int tab_id);
@@ -291,19 +289,15 @@
 
   // 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.
-  scoped_ptr<ui::ThrobAnimation> tab_animation_;
+  // 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_refptr<ui::AnimationContainer> animation_container_;
 
   views::ImageButton* close_button_;
 
-  // Whether to disable throbber animations. Only true if this is an app tab
-  // renderer and a command line flag has been passed in to disable the
-  // animations.
-  bool throbber_disabled_;
-
   ui::ThemeProvider* theme_provider_;
 
   views::GlowHoverController hover_controller_;
@@ -315,9 +309,6 @@
   // The offset used to paint the inactive background image.
   gfx::Point background_offset_;
 
-  // Animation used when the title of an inactive mini tab changes.
-  scoped_ptr<ui::MultiAnimation> mini_title_animation_;
-
   struct TabImage {
     gfx::ImageSkia* image_l;
     gfx::ImageSkia* image_c;