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

chrome/browser/ui/views/tabs/media_indicator_button.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/ui/views/tabs/media_indicator_button.h"
 
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_controller.h"
 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
 #include "content/public/browser/user_metrics.h"
@@ skipping 53 matching lines @@
   SetEventTargeter(
       scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
 MediaIndicatorButton::~MediaIndicatorButton() {}
 
 void MediaIndicatorButton::TransitionToMediaState(TabMediaState next_state) {
   if (next_state == media_state_)
     return;
 
-  if (next_state != TAB_MEDIA_STATE_NONE) {
-    ui::ThemeProvider* tp = GetThemeProvider();
-    gfx::ImageSkia indicator_image =
-        chrome::GetTabMediaIndicatorImage(next_state, tp).AsImageSkia();
-    SetImage(views::CustomButton::STATE_NORMAL, &indicator_image);
-    SetImage(views::CustomButton::STATE_DISABLED, &indicator_image);
-    gfx::ImageSkia affordance_image =
-        chrome::GetTabMediaIndicatorAffordanceImage(next_state, tp)
-            .AsImageSkia();
-    SetImage(views::CustomButton::STATE_HOVERED, &affordance_image);
-    SetImage(views::CustomButton::STATE_PRESSED, &affordance_image);
-  }
+  if (next_state != TAB_MEDIA_STATE_NONE)
+    ResetImages(next_state);
 
   if ((media_state_ == TAB_MEDIA_STATE_AUDIO_PLAYING &&
        next_state == TAB_MEDIA_STATE_AUDIO_MUTING) ||
       (media_state_ == TAB_MEDIA_STATE_AUDIO_MUTING &&
        next_state == TAB_MEDIA_STATE_AUDIO_PLAYING) ||
       (media_state_ == TAB_MEDIA_STATE_AUDIO_MUTING &&
        next_state == TAB_MEDIA_STATE_NONE)) {
     // Instant user feedback: No fade animation.
     showing_media_state_ = next_state;
     fade_animation_.reset();
@@ skipping 35 matching lines @@
   // Note that IsTriggerableEvent() is also overridden to provide an even wider
   // requirement for tap gestures.
   if (enable && !GetTab()->IsActive()) {
     const int required_width = width() * kMinMouseSelectableAreaPercent / 100;
     enable = (GetTab()->GetWidthOfLargestSelectableRegion() >= required_width);
   }
 
   SetEnabled(enable);
 }
 
+void MediaIndicatorButton::OnParentTabButtonColorChanged() {
+  if ((media_state_ == TAB_MEDIA_STATE_AUDIO_PLAYING) ||
+      (media_state_ == TAB_MEDIA_STATE_AUDIO_MUTING))

[Peter Kasting, 2015/09/19 07:26:34]

One could argue that the conditional here is a layering violation, because it's
the code in GetTabMediaIndicatorImage() that knows that only these two states
are affected by color changes, so we should just always call ResetImages().  I
think it's OK for this class to "know that detail" and get an efficiency win.

+    ResetImages(media_state_);
+}
+
 const char* MediaIndicatorButton::GetClassName() const {
   return kViewClassName;
 }
 
 views::View* MediaIndicatorButton::GetTooltipHandlerForPoint(
     const gfx::Point& point) {
   return NULL;  // Tab (the parent View) provides the tooltip.
 }
 
 bool MediaIndicatorButton::OnMousePressed(const ui::MouseEvent& event) {
@@ skipping 87 matching lines @@
       return false;
   }
 
   return views::ImageButton::IsTriggerableEvent(event);
 }
 
 Tab* MediaIndicatorButton::GetTab() const {
   DCHECK_EQ(static_cast<views::View*>(parent_tab_), parent());
   return parent_tab_;
 }
+
+void MediaIndicatorButton::ResetImages(TabMediaState state) {
+  SkColor color = parent_tab_->button_color();
+  gfx::ImageSkia indicator_image =
+      chrome::GetTabMediaIndicatorImage(state, color).AsImageSkia();
+  SetImage(views::CustomButton::STATE_NORMAL, &indicator_image);
+  SetImage(views::CustomButton::STATE_DISABLED, &indicator_image);
+  gfx::ImageSkia affordance_image =
+      chrome::GetTabMediaIndicatorAffordanceImage(state, color).AsImageSkia();
+  SetImage(views::CustomButton::STATE_HOVERED, &affordance_image);
+  SetImage(views::CustomButton::STATE_PRESSED, &affordance_image);
+}