[Material][Mac] Fix Default Favicon's Color

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/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 141 matching lines @@
 }
 
 - (void)setFadeOutValue:(CGFloat)value {
   [self setNeedsDisplay];
 }
 
 - (TabView *)tabView {
   return base::mac::ObjCCast<TabView>([self superview]);
 }
 
-- (SkColor)iconColor {
-  if ([[self window] hasDarkTheme]) {
-    return SkColorSetARGB(0xFF, 0xC4, 0xC4, 0xC4);
-  }
-
-  const ui::ThemeProvider* themeProvider = [[self window] themeProvider];
-  if (themeProvider) {
-    TabView* tabView = [self tabView];
-    bool use_active_tab_text_color = !tabView || [tabView isActiveTab];
-
-    const SkColor titleColor = use_active_tab_text_color ?
-        themeProvider->GetColor(ThemeProperties::COLOR_TAB_TEXT) :
-        themeProvider->GetColor(ThemeProperties::COLOR_BACKGROUND_TAB_TEXT);
-    return SkColorSetA(titleColor, 0xA0);
-  }
-
-  // Return the default COLOR_TAB_TEXT color.
-  return SkColorSetARGB(0xA0, 0x00, 0x00, 0x00);
-}
-
 - (NSImage*)imageForHoverState:(HoverState)hoverState {
   int imageID = IDR_CLOSE_1;
 
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     switch (hoverState) {
       case kHoverStateNone:
         imageID = IDR_CLOSE_1;
         break;
       case kHoverStateMouseOver:
         imageID = IDR_CLOSE_1_H;
         break;
       case kHoverStateMouseDown:
         imageID = IDR_CLOSE_1_P;
         break;
     }
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     return bundle.GetNativeImageNamed(imageID).ToNSImage();
   }
 
   gfx::VectorIconId vectorIconID;
   SkColor vectorIconColor = gfx::kPlaceholderColor;
+  TabView* tabView = [self tabView];
 
   switch (hoverState) {
     case kHoverStateNone:
       vectorIconID = gfx::VectorIconId::TAB_CLOSE_NORMAL;
-      vectorIconColor = [self iconColor];
+      vectorIconColor =
+          tabView ? [tabView iconColor] : tabs::kDefaultTabTextColor;
       break;
     case kHoverStateMouseOver:
       // For mouse over, the icon color is the fill color of the circle.
       vectorIconID = gfx::VectorIconId::TAB_CLOSE_HOVERED_PRESSED;
       vectorIconColor = SkColorSetARGB(0xFF, 0xDB, 0x44, 0x37);
       break;
     case kHoverStateMouseDown:
       // For mouse pressed, the icon color is the fill color of the circle.
       vectorIconID = gfx::VectorIconId::TAB_CLOSE_HOVERED_PRESSED;
       vectorIconColor = SkColorSetARGB(0xFF, 0xA8, 0x35, 0x2A);
@@ skipping 85 matching lines @@
       break;
     case kHoverStateMouseDown:
       imageID = IDR_CLOSE_DIALOG_P;
       break;
   }
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   return bundle.GetNativeImageNamed(imageID).ToNSImage();
 }
 
 @end