Make the tab close button color match the tab text....

chrome/browser/views/tabs/tab_renderer.cc

 // Copyright (c) 2006-2008 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/views/tabs/tab_renderer.h"
 
 #include <limits>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
@@ skipping 36 matching lines @@
 // How long the pulse throb takes.
 static const int kPulseDurationMs = 200;
 
 // How opaque to make the hover state (out of 1).
 static const double kHoverOpacity = 0.33;
 
 // TODO(beng): (Cleanup) This stuff should move onto the class.
 static gfx::Font* title_font = NULL;
 static int title_font_height = 0;
 static SkBitmap* close_button_n = NULL;
+static SkBitmap* close_button_m = NULL;
 static SkBitmap* close_button_h = NULL;
 static SkBitmap* close_button_p = NULL;
 static int close_button_height = 0;
 static int close_button_width = 0;
 
 static SkBitmap* waiting_animation_frames = NULL;
 static SkBitmap* loading_animation_frames = NULL;
 static SkBitmap* crashed_fav_icon = NULL;
 static int loading_animation_frame_count = 0;
 static int waiting_animation_frame_count = 0;
 static int waiting_to_loading_frame_count_ratio = 0;
 
 TabRenderer::TabImage TabRenderer::tab_alpha = {0};
 TabRenderer::TabImage TabRenderer::tab_active = {0};
 TabRenderer::TabImage TabRenderer::tab_inactive = {0};
 
 namespace {
 
 void InitResources() {
   static bool initialized = false;
   if (!initialized) {
     // TODO(glen): Allow theming of these.
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     title_font = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont));
     title_font_height = title_font->height();
 
     close_button_n = rb.GetBitmapNamed(IDR_TAB_CLOSE);
+    close_button_m = rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK);
     close_button_h = rb.GetBitmapNamed(IDR_TAB_CLOSE_H);
     close_button_p = rb.GetBitmapNamed(IDR_TAB_CLOSE_P);
     close_button_width = close_button_n->width();
     close_button_height = close_button_n->height();
 
     TabRenderer::LoadTabImages();
 
     // The loading animation image is a strip of states. Each state must be
     // square, so the height must divide the width evenly.
     loading_animation_frames = rb.GetBitmapNamed(IDR_THROBBER);
@@ skipping 131 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRenderer, public:
 
 TabRenderer::TabRenderer()
     : animation_state_(ANIMATION_NONE),
       animation_frame_(0),
       showing_icon_(false),
       showing_close_button_(false),
       fav_icon_hiding_offset_(0),
+      close_button_color_(NULL),
       crash_animation_(NULL),
       should_display_crashed_favicon_(false),
       theme_provider_(NULL) {
   InitResources();
 
   // Add the Close Button.
   close_button_ = new TabCloseButton(this);
   close_button_->SetImage(views::CustomButton::BS_NORMAL, close_button_n);
   close_button_->SetImage(views::CustomButton::BS_HOT, close_button_h);
   close_button_->SetImage(views::CustomButton::BS_PUSHED, close_button_p);
@@ skipping 229 matching lines @@
   // Size the Close button.
   showing_close_button_ = ShouldShowCloseBox();
   if (showing_close_button_) {
     int close_button_top =
         kTopPadding + kCloseButtonVertFuzz +
         (content_height - close_button_height) / 2;
     // If the ratio of the close button size to tab width exceeds the maximum.
     close_button_->SetBounds(lb.width() + kCloseButtonHorzFuzz,
                              close_button_top, close_button_width,
                              close_button_height);
+
+    // If the close button color has changed, generate a new one.
+    SkColor tab_text_color =
+        GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_TAB_TEXT);
+    if (!close_button_color_ || tab_text_color != close_button_color_) {
+      close_button_color_ = tab_text_color;
+      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+      close_button_->SetBackground(close_button_color_,
+          rb.GetBitmapNamed(IDR_TAB_CLOSE),
+          rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK));
+    }
+
     close_button_->SetVisible(true);
   } else {
     close_button_->SetBounds(0, 0, 0, 0);
     close_button_->SetVisible(false);
   }
 
   // Size the Title text to fill the remaining space.
   int title_left = favicon_bounds_.right() + kFavIconTitleSpacing;
   int title_top = kTopPadding + (content_height - title_font_height) / 2;
 
@@ skipping 301 matching lines @@
   tab_inactive.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
 
   tab_inactive.l_width = tab_inactive.image_l->width();
   tab_inactive.r_width = tab_inactive.image_r->width();
 
   loading_animation_frames = rb.GetBitmapNamed(IDR_THROBBER);
   waiting_animation_frames = rb.GetBitmapNamed(IDR_THROBBER_WAITING);
 }