Clean up the tab animations (part 2)

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/views/tabs/tab_renderer_data.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/layout.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 MultiAnimation;
-class ThrobAnimation;
+class LinearAnimation;
 }
 namespace views {
 class ImageButton;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 //  A View that renders a Tab, either in a TabStrip or in a DraggedTabView.
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 13 matching lines @@
   // 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);
-  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
   // 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 115 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 PaintTabImmersive(gfx::Canvas* canvas);
 
   // 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);
   void PaintActiveTabBackground(gfx::Canvas* canvas);
 
   // Paints the icon at the specified coordinates, mirrored for RTL if needed.
   void PaintIcon(gfx::Canvas* canvas);
   void PaintTitle(gfx::Canvas* canvas, SkColor title_color);
 
   // Invoked if data_.network_state changes, or the network_state is not none.
@@ skipping 71 matching lines @@
   // crashes.
   int favicon_hiding_offset_;
 
   // The current index of the loading animation.
   int loading_animation_frame_;
 
   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.
-  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_;
 
   // The bounds of various sections of the display.
   gfx::Rect favicon_bounds_;
   gfx::Rect title_bounds_;
 
   // 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;
     gfx::ImageSkia* image_r;
     int l_width;
     int r_width;
     int y_offset;
   };
   static TabImage tab_active_;
   static TabImage tab_inactive_;
@@ skipping 20 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_