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

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"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/tabs/alert_indicator_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMFadeTruncatingTextFieldCell.h"
 #import "ui/base/cocoa/nsgraphics_context_additions.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/cocoa/three_part_image.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/scoped_ns_graphics_context_save_gstate_mac.h"
 
+namespace {
+
+// The color of the icons in dark mode theme.
+const SkColor kDarkModeIconColor = SkColorSetARGB(0xFF, 0xC4, 0xC4, 0xC4);
+
+} // namespace
 
 // The amount of time in seconds during which each type of glow increases, holds
 // steady, and decreases, respectively.
 const NSTimeInterval kHoverShowDuration = 0.2;
 const NSTimeInterval kHoverHoldDuration = 0.02;
 const NSTimeInterval kHoverHideDuration = 0.4;
 const NSTimeInterval kAlertShowDuration = 0.4;
 const NSTimeInterval kAlertHoldDuration = 0.4;
 const NSTimeInterval kAlertHideDuration = 0.4;
 
@@ skipping 584 matching lines @@
   return [titleView_ isHidden];
 }
 
 - (void)setTitleHidden:(BOOL)titleHidden {
   if (titleHidden == [titleView_ isHidden])
     return;
   [titleView_ setHidden:titleHidden];
   [self setNeedsDisplayInRect:[titleView_ frame]];
 }
 
-- (SkColor)closeButtonColor {
-  return [[controller_ closeButton] iconColor];
+- (SkColor)iconColor {
+  if ([[self window] hasDarkTheme])
+    return kDarkModeIconColor;
+
+  const ui::ThemeProvider* themeProvider = [[self window] themeProvider];
+  if (themeProvider) {
+    bool use_active_tab_text_color = [self isActiveTab];

[Robert Sesek, 2016/07/12 23:43:56]

naming: camelCase in ObjC

[spqchan, 2016/07/13 17:16:14]

Done.

+
+    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 tabs::kDefaultTabTextColor;
 }
 
 - (void)accessibilityOptionsDidChange:(id)ignored {
   [self updateLabelFont];
   [self setNeedsDisplay:YES];
 }
 
 - (void)updateLabelFont {
   CGFloat fontSize = [titleViewCell_ font].pointSize;
   const ui::ThemeProvider* provider = [[self window] themeProvider];
@@ skipping 364 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