Attempt 2 at:

chrome/browser/views/tabs/base_tab.h

 // Copyright (c) 2010 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_VIEWS_TABS_BASE_TAB_H_
 #define CHROME_BROWSER_VIEWS_TABS_BASE_TAB_H_
 
 #include "app/animation.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
@@ skipping 14 matching lines @@
 namespace views {
 class ImageButton;
 }  // namespace views
 
 // Base class for tab renderers.
 class BaseTab : public AnimationDelegate,
                 public views::ButtonListener,
                 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
   // update themselves appropriately.
   void SetData(const TabRendererData& data);
   const TabRendererData& data() const { return data_; }
 
   // Sets the network state. If the network state changes NetworkStateChanged is
   // invoked.
   virtual void UpdateLoadingAnimation(TabRendererData::NetworkState state);
@@ skipping 18 matching lines @@
     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(ThemeProvider* provider) {
     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;
 
   // views::View overrides:
   virtual void OnMouseEntered(const views::MouseEvent& event);
   virtual void OnMouseExited(const views::MouseEvent& event);
   virtual bool OnMousePressed(const views::MouseEvent& event);
   virtual bool OnMouseDragged(const views::MouseEvent& event);
   virtual void OnMouseReleased(const views::MouseEvent& event,
                                bool canceled);
@@ skipping 13 matching lines @@
 
   // Returns the pulse animation. The pulse animation is non-null if StartPulse
   // has been invoked.
   ThrobAnimation* pulse_animation() const { return pulse_animation_.get(); }
 
   // Returns the hover animation. This may return null.
   const SlideAnimation* hover_animation() const {
     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);
   void PaintTitle(gfx::Canvas* canvas, SkColor title_color);
 
   // Overridden from AnimationDelegate:
   virtual void AnimationProgressed(const Animation* animation);
   virtual void AnimationCanceled(const Animation* animation);
   virtual void AnimationEnded(const Animation* animation);
 
@@ skipping 18 matching lines @@
 
   // Size (width/height) of the loading animation.
   static int loading_animation_size() { return loading_animation_size_; }
 
   static gfx::Font* font() { return font_; }
   static int font_height() { return font_height_; }
 
  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.
   void SetFavIconHidingOffset(int offset);
 
   void DisplayCrashedFavIcon();
   void ResetCrashedFavIcon();
 
   // Starts/Stops the crash animation.
   void StartCrashAnimation();
@@ skipping 23 matching lines @@
   scoped_ptr<ThrobAnimation> pulse_animation_;
 
   // Hover animation.
   scoped_ptr<SlideAnimation> hover_animation_;
 
   // Crash animation.
   scoped_ptr<FavIconCrashAnimation> crash_animation_;
 
   scoped_refptr<AnimationContainer> animation_container_;
 
-  views::ImageButton* close_button_;
+  TabCloseButton* close_button_;
 
   // The current index of the loading animation.
   int loading_animation_frame_;
 
   // Whether to disable throbber animations. Only true if this is a nano tab
   // renderer and a command line flag has been passed in to disable the
   // animations.
   bool throbber_disabled_;
 
   ThemeProvider* theme_provider_;
@@ skipping 11 matching lines @@
   // Size of the loading animation frames.
   static int loading_animation_size_;
 
   static gfx::Font* font_;
   static int font_height_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseTab);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TABS_BASE_TAB_H_