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

chrome/browser/ui/cocoa/tabs/tab_controller.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_controller.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/i18n/rtl.h"
 #include "base/mac/bundle_locations.h"
 #import "chrome/browser/themes/theme_properties.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/sprite_view.h"
+#include "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"
 #import "chrome/browser/ui/cocoa/tabs/alert_indicator_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "content/public/browser/user_metrics.h"
 #import "extensions/common/extension.h"
 #import "ui/base/cocoa/menu_controller.h"
 #include "ui/base/material_design/material_design_controller.h"
 
 @implementation TabController
 
 @synthesize action = action_;
 @synthesize loadingState = loadingState_;
 @synthesize pinned = pinned_;
 @synthesize target = target_;
 @synthesize url = url_;
+@synthesize shouldUseDefaultFavicon = shouldUseDefaultFavicon_;
 
 namespace TabControllerInternal {
 
 // A C++ delegate that handles enabling/disabling menu items and handling when
 // a menu command is chosen. Also fixes up the menu item label for "pin/unpin
 // tab".
 class MenuDelegate : public ui::SimpleMenuModel::Delegate {
  public:
   explicit MenuDelegate(id<TabControllerTarget> target, TabController* owner)
       : target_(target),
@@ skipping 123 matching lines @@
 - (void)internalSetSelected:(BOOL)selected {
   TabView* tabView = [self tabView];
   if ([self active]) {
     [tabView setState:NSOnState];
     [tabView cancelAlert];
   } else {
     [tabView setState:selected ? NSMixedState : NSOffState];
   }
   [self updateVisibility];
   [self updateTitleColor];
+  [self updateDefaultFavicon];
 }
 
 // Called when Cocoa wants to display the context menu. Lazily instantiate
 // the menu based off of the cross-platform model. Re-create the menu and
 // model every time to get the correct labels and enabling.
 - (NSMenu*)menu {
   contextMenuDelegate_.reset(
       new TabControllerInternal::MenuDelegate(target_, self));
   contextMenuModel_.reset(
       [target_ contextMenuModelForController:self
@@ skipping 265 matching lines @@
   NSColor* titleColor = nil;
   const ui::ThemeProvider* theme = [[[self view] window] themeProvider];
   if (theme && ![self selected])
     titleColor = theme->GetNSColor(ThemeProperties::COLOR_BACKGROUND_TAB_TEXT);
   // Default to the selected text color unless told otherwise.
   if (theme && !titleColor)
     titleColor = theme->GetNSColor(ThemeProperties::COLOR_TAB_TEXT);
   [[self tabView] setTitleColor:titleColor ? titleColor : [NSColor textColor]];
 }
 
+- (void)updateDefaultFavicon {
+  if (ui::MaterialDesignController::IsModeMaterial() &&
+      shouldUseDefaultFavicon_) {
+    [self setIconImage:mac::DefaultFavicon([[self tabView] iconColor])];
+  }
+}
+
 - (void)themeChangedNotification:(NSNotification*)notification {
   [self updateTitleColor];
+  [self updateDefaultFavicon];
 }
 
 // Called by the tabs to determine whether we are in rapid (tab) closure mode.
 - (BOOL)inRapidClosureMode {
   if ([[self target] respondsToSelector:@selector(inRapidClosureMode)]) {
     return [[self target] performSelector:@selector(inRapidClosureMode)] ?
         YES : NO;
   }
   return NO;
 }
 
 - (void)maybeStartDrag:(NSEvent*)event forTab:(TabController*)tab {
   [[target_ dragController] maybeStartDrag:event forTab:tab];
 }
 
 @end