Paint tab-loading throbbers into a ui::Layer (reland).

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>
 
@@ skipping 71 matching lines @@
   void ActiveStateChanged();
 
   // Returns true if the tab is selected.
   bool IsSelected() const;
 
   // Sets the data this tabs displays. Invokes DataChanged. Should only be
   // called after Tab is added to widget hierarchy.
   void SetData(const TabRendererData& data);
   const TabRendererData& data() const { return data_; }
 
-  // Sets the network state. If the network state changes NetworkStateChanged is
-  // invoked.
+  // Sets the network state.
   void UpdateLoadingAnimation(TabRendererData::NetworkState state);
 
   // Starts/Stops a pulse animation.
   void StartPulse();
   void StopPulse();
 
   // Start/stop the pinned tab title animation.
   void StartPinnedTabTitleAnimation();
   void StopPinnedTabTitleAnimation();
 
@@ skipping 50 matching lines @@
   // Returns the height for immersive mode tabs.
   static int GetImmersiveHeight();
 
   // Returns the Y inset within the tab bounds for drawing the background image.
   // This is necessary for correct vertical alignment of the frame, tab, and
   // toolbar images with custom themes.
   static int GetYInsetForActiveTabBackground();
 
  private:
   friend class TabTest;
-  FRIEND_TEST_ALL_PREFIXES(TabTest, CloseButtonLayout);
-
   friend class TabStripTest;
   FRIEND_TEST_ALL_PREFIXES(TabStripTest, TabHitTestMaskWhenStacked);
   FRIEND_TEST_ALL_PREFIXES(TabStripTest, TabCloseButtonVisibilityWhenStacked);
 
   // The animation object used to swap the favicon with the sad tab icon.
   class FaviconCrashAnimation;
+
   class TabCloseButton;
+  class ThrobberView;
 
   // Contains a cached image and the values used to generate it.
   struct ImageCacheEntry {
     ImageCacheEntry();
     ~ImageCacheEntry();
 
     // ID of the resource used.
     int resource_id;
 
     // Scale factor we're drawing it.
@@ skipping 69 matching lines @@
   void PaintTabFill(gfx::Canvas* canvas,
                     gfx::ImageSkia* fill_image,
                     int x_offset,
                     int y_offset,
                     bool is_active);
 
   // Paints the favicon, mirrored for RTL if needed.
   void PaintIcon(gfx::Canvas* canvas);
 
   // Invoked if data_.network_state changes, or the network_state is not none.
-  void AdvanceLoadingAnimation(TabRendererData::NetworkState old_state,
-                               TabRendererData::NetworkState state);
+  void AdvanceLoadingAnimation();
 
   // Returns the number of favicon-size elements that can fit in the tab's
   // current size.
   int IconCapacity() const;
 
   // Returns whether the Tab should display a favicon.
   bool ShouldShowIcon() const;
 
   // Returns whether the Tab should display the media indicator.
   bool ShouldShowMediaIndicator() const;
@@ skipping 57 matching lines @@
   // True if the tab is being dragged.
   bool dragging_;
 
   // True if the tab has been detached.
   bool detached_;
 
   // The offset used to animate the favicon location. This is used when the tab
   // crashes.
   int favicon_hiding_offset_;
 
-  // The point in time when the tab icon was first painted in the waiting state.
-  base::TimeTicks waiting_start_time_;
-
-  // The point in time when the tab icon was first painted in the loading state.
-  base::TimeTicks loading_start_time_;
-
-  // Paint state for the throbber after the most recent waiting paint.
-  gfx::ThrobberWaitingState waiting_state_;
-
   // Step in the immersive loading progress indicator.
   int immersive_loading_step_;
 
   bool should_display_crashed_favicon_;
 
   // Whole-tab throbbing "pulse" animation.
   scoped_ptr<gfx::ThrobAnimation> pulse_animation_;
 
   scoped_ptr<gfx::MultiAnimation> pinned_title_change_animation_;
 
   // Crash icon animation (in place of favicon).
   scoped_ptr<gfx::LinearAnimation> crash_icon_animation_;
 
   scoped_refptr<gfx::AnimationContainer> animation_container_;
 
+  ThrobberView* throbber_;
   MediaIndicatorButton* media_indicator_button_;
   views::ImageButton* close_button_;
   views::Label* title_;
 
   bool tab_activated_with_last_tap_down_;
 
   views::GlowHoverController hover_controller_;
 
   // The bounds of various sections of the display.
   gfx::Rect favicon_bounds_;
@@ skipping 28 matching lines @@
   SkColor button_color_;
 
   // 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_