TabStrip Cleanup

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 a3da1c535db98d00401738ea3339852de5216e0f..307504d8c4d6cff662ca621bdcb7826d56a70fc2 100644
--- a/chrome/browser/ui/views/tabs/tab.h
+++ b/chrome/browser/ui/views/tabs/tab.h
@@ -36,14 +36,10 @@ class Tab : public BaseTab {
 
   // Set the background offset used to match the image in the inactive tab
   // to the frame image.
-  void SetBackgroundOffset(const gfx::Point& offset) {
+  void set_background_offset(const gfx::Point& offset) {
     background_offset_ = offset;
   }
 
-  // Paints the icon. Most of the time you'll want to invoke Paint directly, but
-  // in certain situations this invoked outside of Paint.
-  void PaintIcon(gfx::Canvas* canvas);
-
   // Returns the minimum possible size of a single unselected Tab.
   static gfx::Size GetMinimumUnselectedSize();
   // Returns the minimum possible size of a selected Tab. Selected tabs must
@@ -57,9 +53,6 @@ class Tab : public BaseTab {
   // Returns the width for mini-tabs. Mini-tabs always have this width.
   static int GetMiniWidth();
 
-  // Loads the images to be used for the tab background.
-  static void LoadTabImages();
-
  protected:
   virtual const gfx::Rect& title_bounds() const { return title_bounds_; }
 
@@ -77,6 +70,10 @@ class Tab : public BaseTab {
   virtual bool GetTooltipTextOrigin(const gfx::Point& p, gfx::Point* origin);
   virtual void OnMouseMoved(const views::MouseEvent& event);
 
+  // Paints the icon. Most of the time you'll want to invoke Paint directly, but
+  // in certain situations this invoked outside of Paint.
+  void PaintIcon(gfx::Canvas* canvas);

[sky, 2011/01/04 20:01:01]

Move this between 81 and 82. Also, no need to have the comment.

[wyck, 2011/01/11 20:23:49]

Done.

+
   // Paint various portions of the Tab
   void PaintTabBackground(gfx::Canvas* canvas);
   void PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas);
@@ -99,6 +96,12 @@ class Tab : public BaseTab {
   // mini tab title change and pulsing.
   double GetThrobValue();
 
+  // Performs a one-time initialization of static resources such as tab images.
+  static void InitTabResources();
+
+  // Loads the images to be used for the tab background.
+  static void LoadTabImages();
+
   // The bounds of various sections of the display.
   gfx::Rect favicon_bounds_;
   gfx::Rect title_bounds_;
@@ -120,9 +123,9 @@ class Tab : public BaseTab {
     int r_width;
     int y_offset;
   };
-  static TabImage tab_active;
-  static TabImage tab_inactive;
-  static TabImage tab_alpha;
+  static TabImage tab_active_;
+  static TabImage tab_inactive_;
+  static TabImage tab_alpha_;
 
   // Whether we're showing the icon. It is cached so that we can detect when it
   // changes and layout appropriately.