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

chrome/browser/ui/cocoa/hover_close_button.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/hover_close_button.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/vector_icons/vector_icons.h"
-#include "chrome/browser/themes/theme_properties.h"
-#include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #include "chrome/grit/generated_resources.h"
-#include "chrome/grit/theme_resources.h"
 #include "components/strings/grit/components_strings.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMKeyValueAnimation.h"
 #include "ui/base/cocoa/animation_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/resources/grit/ui_resources.h"
 
 namespace  {
 const CGFloat kFramesPerSecond = 16; // Determined experimentally to look good.
 const CGFloat kCloseAnimationDuration = 0.1;
 const int kTabCloseButtonSize = 16;
 
 // Strings that are used for all close buttons. Set up in +initialize.
 NSString* gBasicAccessibilityTitle = nil;
 NSString* gTooltip = nil;
 
 // If this string is changed, the setter (currently setFadeOutValue:) must
 // be changed as well to match.
 NSString* const kFadeOutValueKeyPath = @"fadeOutValue";
+
+const SkColor kDefaultIconColor = SkColorSetARGB(0xA0, 0x00, 0x00, 0x00);
 }  // namespace
 
 @interface HoverCloseButton ()
 
 // Common initialization routine called from initWithFrame and awakeFromNib.
 - (void)commonInit;
 
 // Called by |fadeOutAnimation_| when animated value changes.
 - (void)setFadeOutValue:(CGFloat)value;
 
 // Gets the image for the given hover state.
 - (NSImage*)imageForHoverState:(HoverState)hoverState;
 
 @end
 
 @implementation HoverCloseButton
 
+@synthesize iconColor = iconColor_;
+
 + (void)initialize {
   // Grab some strings that are used by all close buttons.
   if (!gBasicAccessibilityTitle) {
     gBasicAccessibilityTitle = [l10n_util::GetNSStringWithFixup(
         IDS_ACCNAME_CLOSE) copy];
   }
   if (!gTooltip)
     gTooltip = [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_CLOSE_TAB) copy];
 }
 
@@ skipping 81 matching lines @@
 - (void)drawFocusRingMask {
   // Match the hover image's shape.
   NSRect circleRect = NSInsetRect([self bounds], 2, 2);
   [[NSBezierPath bezierPathWithOvalInRect:circleRect] fill];
 }
 
 - (void)setFadeOutValue:(CGFloat)value {
   [self setNeedsDisplay];
 }
 
-- (TabView *)tabView {
-  return base::mac::ObjCCast<TabView>([self superview]);
-}
-
 - (NSImage*)imageForHoverState:(HoverState)hoverState {
   const gfx::VectorIcon* vectorIcon = nullptr;
   SkColor vectorIconColor = gfx::kPlaceholderColor;
-  TabView* tabView = [self tabView];
 
   switch (hoverState) {
     case kHoverStateNone:
       vectorIcon = &kTabCloseNormalIcon;
-      vectorIconColor =
-          tabView ? [tabView iconColor] : tabs::kDefaultTabTextColor;
+      vectorIconColor = iconColor_;
       break;
     case kHoverStateMouseOver:
       // For mouse over, the icon color is the fill color of the circle.
       vectorIcon = &kTabCloseHoveredPressedIcon;
       vectorIconColor = SkColorSetARGB(0xFF, 0xDB, 0x44, 0x37);
       break;
     case kHoverStateMouseDown:
       // For mouse pressed, the icon color is the fill color of the circle.
       vectorIcon = &kTabCloseHoveredPressedIcon;
       vectorIconColor = SkColorSetARGB(0xFF, 0xA8, 0x35, 0x2A);
@@ skipping 28 matching lines @@
 }
 
 - (void)commonInit {
   [self setAccessibilityTitle:nil];
 
   // Add a tooltip. Using 'owner:self' means that
   // -view:stringForToolTip:point:userData: will be called to provide the
   // tooltip contents immediately before showing it.
   [self addToolTipRect:[self bounds] owner:self userData:NULL];
 
-  // Initialize previousState.
   previousState_ = kHoverStateNone;
+  iconColor_ = kDefaultIconColor;
 }
 
 // Called each time a tooltip is about to be shown.
 - (NSString*)view:(NSView*)view
  stringForToolTip:(NSToolTipTag)tag
             point:(NSPoint)point
          userData:(void*)userData {
   if (self.hoverState == kHoverStateMouseOver) {
     // In some cases (e.g. the download tray), the button is still in the
     // hover state, but is outside the bounds of its parent and not visible.
@@ skipping 12 matching lines @@
     [super setAccessibilityTitle:gBasicAccessibilityTitle];
     return;
   }
 
   NSString* extendedTitle = l10n_util::GetNSStringFWithFixup(
       IDS_ACCNAME_CLOSE_TAB,
       base::SysNSStringToUTF16(accessibilityTitle));
   [super setAccessibilityTitle:extendedTitle];
 }
 
+- (void)setIconColor:(SkColor)iconColor {
+  if (iconColor != iconColor_) {
+    iconColor_ = iconColor;
+    [self setNeedsDisplay:YES];
+  }
+}
+
 @end
 
 @implementation WebUIHoverCloseButton
 
 - (NSImage*)imageForHoverState:(HoverState)hoverState {
   int imageID = IDR_CLOSE_DIALOG;
   switch (hoverState) {
     case kHoverStateNone:
       imageID = IDR_CLOSE_DIALOG;
       break;
     case kHoverStateMouseOver:
       imageID = IDR_CLOSE_DIALOG_H;
       break;
     case kHoverStateMouseDown:
       imageID = IDR_CLOSE_DIALOG_P;
       break;
   }
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   return bundle.GetNativeImageNamed(imageID).ToNSImage();
 }
 
 @end