Fix using theme colors for the download shelf's close button.

chrome/browser/ui/cocoa/tabs/tab_view.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 595 matching lines @@
 
 - (NSColor*)titleColor {
   return [titleView_ textColor];
 }
 
 - (void)setTitleColor:(NSColor*)titleColor {
   if ([titleColor isEqual:[titleView_ textColor]])
     return;
   [titleView_ setTextColor:titleColor];
   [self setNeedsDisplayInRect:[titleView_ frame]];
+  [self updateAppearance];
 }
 
 - (BOOL)titleHidden {
   return [titleView_ isHidden];
 }
 
 - (void)setTitleHidden:(BOOL)titleHidden {
   if (titleHidden == [titleView_ isHidden])
     return;
   [titleView_ setHidden:titleHidden];
@@ skipping 13 matching lines @@
             ? themeProvider->GetColor(ThemeProperties::COLOR_TAB_TEXT)
             : themeProvider->GetColor(
                   ThemeProperties::COLOR_BACKGROUND_TAB_TEXT);
     return SkColorSetA(titleColor, 0xA0);
   }
 
   return tabs::kDefaultTabTextColor;
 }
 
 - (void)accessibilityOptionsDidChange:(id)ignored {
-  [self updateLabelFont];
+  [self updateAppearance];
   [self setNeedsDisplay:YES];
 }
 
-- (void)updateLabelFont {
+- (void)updateAppearance {
   CGFloat fontSize = [titleViewCell_ font].pointSize;
   const ui::ThemeProvider* provider = [[self window] themeProvider];
   if (provider && provider->ShouldIncreaseContrast() && state_ == NSOnState) {
     [titleViewCell_ setFont:[NSFont boldSystemFontOfSize:fontSize]];
   } else {
     [titleViewCell_ setFont:[NSFont systemFontOfSize:fontSize]];
   }
+
+  [closeButton_ setIconColor:[self iconColor]];
 }
 
 - (void)setState:(NSCellStateValue)state {
   if (state_ == state)
     return;
   state_ = state;
-  [self updateLabelFont];
+  [self updateAppearance];
   [self setNeedsDisplay:YES];
-  [closeButton_ setNeedsDisplay:YES];
 }
 
 - (void)setClosing:(BOOL)closing {
   closing_ = closing;  // Safe because the property is nonatomic.
   // When closing, ensure clicks to the close button go nowhere.
   if (closing) {
     [closeButton_ setTarget:nil];
     [closeButton_ setAction:nil];
   }
 }
@@ skipping 340 matching lines @@
 
 // For "Increase Contrast" mode, use flat black instead of semitransparent black
 // for the tab edge stroke.
 + (void)setTabEdgeStrokeColor {
   static NSColor* heavyStrokeColor =
       [skia::SkColorToSRGBNSColor(SK_ColorBLACK) retain];
   [heavyStrokeColor set];
 }
 
 @end