Render the tab close button as a vector-based icon.

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 50 matching lines @@
 
   // See description above field.
   void set_dragging(bool dragging) { dragging_ = dragging; }
   bool dragging() const { return dragging_; }
 
   // Used to mark the tab as having been detached.  Once this has happened, the
   // tab should be invisibly closed.  This is irreversible.
   void set_detached() { detached_ = true; }
   bool detached() const { return detached_; }
 
+  SkColor button_color() const { return button_color_; }
+
   // Sets the container all animations run from.
-  void set_animation_container(gfx::AnimationContainer* container);
+  void SetAnimationContainer(gfx::AnimationContainer* container);
 
   // Returns true if this tab is the active tab.
   bool IsActive() const;
 
   // Notifies the MediaIndicatorButton that the active state of this tab has
   // changed.
   void ActiveStateChanged();
 
   // Returns true if the tab is selected.
   bool IsSelected() const;
@@ skipping 106 matching lines @@
 
   // views::ContextMenuController:
   void ShowContextMenuForView(views::View* source,
                               const gfx::Point& point,
                               ui::MenuSourceType source_type) override;
 
   // views::MaskedTargeterDelegate:
   bool GetHitTestMask(gfx::Path* mask) const override;
 
   // views::View:
+  void ViewHierarchyChanged(
+      const ViewHierarchyChangedDetails& details) override;
   void OnPaint(gfx::Canvas* canvas) override;
   void Layout() override;
   void OnThemeChanged() override;
   const char* GetClassName() const override;
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override;
   bool GetTooltipTextOrigin(const gfx::Point& p,
                             gfx::Point* origin) const override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
   bool OnMouseDragged(const ui::MouseEvent& event) override;
@@ skipping 63 matching lines @@
 
   void DisplayCrashedFavicon();
   void ResetCrashedFavicon();
 
   void StopCrashAnimation();
   void StartCrashAnimation();
 
   // Returns true if the crash animation is currently running.
   bool IsPerformingCrashAnimation() const;
 
+  // Recalculates the correct |button_color_| and resets the title, media
+  // indicator, and close button colors if necessary.  This should be called any
+  // time the theme or active state may have changed.
+  void OnButtonColorMaybeChanged();
+
   // Schedules repaint task for icon.
   void ScheduleIconPaint();
 
   // Returns a |path| containing the region that matches the bitmap display of
   // this tab, for input event hit testing.  Set |include_top_shadow| to include
   // the mostly-transparent shadow pixels above the top edge of the tab in the
   // path.
   void GetHitTestMaskHelper(bool include_top_shadow, gfx::Path* path) const;
 
   // Returns the rectangle for the light bar in immersive mode.
   gfx::Rect GetImmersiveBarRect() const;
 
   // Gets the tab id and frame id.
   void GetTabIdAndFrameId(views::Widget* widget,
                           int* tab_id,
                           int* frame_id) const;
 
-  // Returns |media_indicator_button_|, creating it on-demand.
-  MediaIndicatorButton* GetMediaIndicatorButton();
-
   // 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();
 
   // Returns the cached image for the specified arguments, or an empty image if
   // there isn't one cached.
   static gfx::ImageSkia GetCachedImage(int resource_id,
                                        const gfx::Size& size,
@@ skipping 39 matching lines @@
   // 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_;
 
+  MediaIndicatorButton* media_indicator_button_;
   views::ImageButton* close_button_;
-  MediaIndicatorButton* media_indicator_button_;  // NULL until first use.
   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_;
 
   // The offset used to paint the inactive background image.
@@ skipping 15 matching lines @@
   bool showing_icon_;
 
   // Whether we're showing the media indicator. It is cached so that we can
   // detect when it changes and layout appropriately.
   bool showing_media_indicator_;
 
   // Whether we are showing the close button. It is cached so that we can
   // detect when it changes and layout appropriately.
   bool showing_close_button_;
 
-  // The current color of the close button.
-  SkColor close_button_color_;
+  // The current color of the media indicator and close button icons.
+  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_