Attempt 2 at:

chrome/browser/views/tabs/base_tab.h

Index: chrome/browser/views/tabs/base_tab.h
diff --git a/chrome/browser/views/tabs/base_tab.h b/chrome/browser/views/tabs/base_tab.h
index e2ac34a5ba365793ad0458c99af190acd284945b..c0c9bde25d53b0f05ebf004d4b3141fec6b85cc1 100644
--- a/chrome/browser/views/tabs/base_tab.h
+++ b/chrome/browser/views/tabs/base_tab.h
@@ -32,7 +32,7 @@ class BaseTab : public AnimationDelegate,
                 public views::ContextMenuController,
                 public views::View {
  public:
-  explicit BaseTab(TabController* controller);
+  BaseTab(TabController* controller, bool show_mini_dot);
   ~BaseTab();
 
   // Sets the data this tabs displays. Invokes DataChanged for subclasses to
@@ -71,6 +71,10 @@ class BaseTab : public AnimationDelegate,
     theme_provider_ = provider;
   }
 
+  // Invoked when the selected state changes. Resets the image of the close
+  // button.
+  void SelectedChanged();
+
   // Returns true if the tab is selected.
   virtual bool IsSelected() const;
 
@@ -104,7 +108,10 @@ class BaseTab : public AnimationDelegate,
     return hover_animation_.get();
   }
 
-  views::ImageButton* close_button() const { return close_button_; }
+  views::ImageButton* close_button() const;
+
+  // Sets the color used to derive the close button images.
+  void SetCloseButtonColor(SkColor color);
 
   // Paints the icon at the specified x-coordinate.
   void PaintIcon(gfx::Canvas* canvas, int x, int y);
@@ -143,6 +150,7 @@ class BaseTab : public AnimationDelegate,
  private:
   // The animation object used to swap the favicon with the sad tab icon.
   class FavIconCrashAnimation;
+  class TabCloseButton;
 
   // Set the temporary offset for the favicon. This is used during the crash
   // animation.
@@ -186,7 +194,7 @@ class BaseTab : public AnimationDelegate,
 
   scoped_refptr<AnimationContainer> animation_container_;
 
-  views::ImageButton* close_button_;
+  TabCloseButton* close_button_;
 
   // The current index of the loading animation.
   int loading_animation_frame_;