An energy usage monitor for Mac, and some layer-backed throbber experiments

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

Index: chrome/browser/ui/views/tabs/tab.h
diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h
index 45dcae6ad61de1c593402c65b8468375f1a584bd..f31939901ea59756ad87a4a95d8952da4dc434de 100644
--- a/chrome/browser/ui/views/tabs/tab.h
+++ b/chrome/browser/ui/views/tabs/tab.h
@@ -164,6 +164,7 @@ class Tab : public gfx::AnimationDelegate,
   // 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 {
@@ -246,8 +247,7 @@ class Tab : public gfx::AnimationDelegate,
   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(TabRendererData::NetworkState state);
 
   // Returns the number of favicon-size elements that can fit in the tab's
   // current size.
@@ -341,15 +341,6 @@ class Tab : public gfx::AnimationDelegate,
   // 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_;
 
@@ -365,6 +356,7 @@ class Tab : public gfx::AnimationDelegate,
 
   scoped_refptr<gfx::AnimationContainer> animation_container_;
 
+  ThrobberView* throbber_;
   MediaIndicatorButton* media_indicator_button_;
   views::ImageButton* close_button_;
   views::Label* title_;