[Mac][Material Design] Show light default favicon in Incognito mode.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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/bookmarks/bookmark_bar_controller.h"
 
 #include <stddef.h>
 
 #import "base/mac/bundle_locations.h"
 #import "base/mac/foundation_util.h"
@@ skipping 297 matching lines @@
     folderTarget_.reset(
         [[BookmarkFolderTarget alloc] initWithController:self
                                                  profile:browser_->profile()]);
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     folderImage_.reset(
         rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER).CopyNSImage());
     if (ui::MaterialDesignController::IsModeMaterial()) {
       folderImageWhite_.reset(
           rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER_WHITE).CopyNSImage());
+
+      const int kIconSize = 16;
+      defaultImage_.reset([NSImageFromImageSkia(
+          gfx::CreateVectorIcon(gfx::VectorIconId::LOCATION_BAR_HTTP,
+                                kIconSize,
+                                gfx::kChromeIconGrey)) retain]);
+      defaultImageIncognito_.reset([NSImageFromImageSkia(
+          gfx::CreateVectorIcon(gfx::VectorIconId::LOCATION_BAR_HTTP,
+                                kIconSize,
+                                SkColorSetA(SK_ColorWHITE, 0xCC))) retain]);
+    } else {
+      defaultImage_.reset(
+          rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).CopyNSImage());
+      defaultImageIncognito_.reset([defaultImage_.get() retain]);
     }
-    defaultImage_.reset(
-        rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).CopyNSImage());
 
     innerContentAnimationsEnabled_ = YES;
     stateAnimationsEnabled_ = YES;
 
     // Register for theme changes, bookmark button pulsing, ...
     NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
     [defaultCenter addObserver:self
                       selector:@selector(themeDidChangeNotification:)
                           name:kBrowserThemeDidChangeNotification
                         object:nil];
@@ skipping 368 matching lines @@
     // If we ever need any other animation cases, code would go here.
   }
 
   // In general, only show the divider when it's in the normal showing state.
   return [self isInState:BookmarkBar::SHOW] ? 0 : 1;
 }
 
 - (NSImage*)faviconForNode:(const BookmarkNode*)node
              forADarkTheme:(BOOL)forADarkTheme {
   if (!node)
-    return defaultImage_;
+    return forADarkTheme ? defaultImageIncognito_ : defaultImage_;
 
   if (forADarkTheme && ui::MaterialDesignController::IsModeMaterial()) {
     if (node == managedBookmarkService_->managed_node()) {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       return rb.GetNativeImageNamed(
           IDR_BOOKMARK_BAR_FOLDER_MANAGED_WHITE).ToNSImage();
     }
 
     if (node == managedBookmarkService_->supervised_node()) {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ skipping 19 matching lines @@
     }
 
     if (node->is_folder())
       return folderImage_;
   }
 
   const gfx::Image& favicon = bookmarkModel_->GetFavicon(node);
   if (!favicon.IsEmpty())
     return favicon.ToNSImage();
 
-  return defaultImage_;
+  return forADarkTheme ? defaultImageIncognito_ : defaultImage_;
 }
 
 - (void)closeFolderAndStopTrackingMenus {
   showFolderMenus_ = NO;
   [self closeAllBookmarkFolders];
 }
 
 - (BOOL)canEditBookmarks {
   PrefService* prefs = browser_->profile()->GetPrefs();
   return prefs->GetBoolean(bookmarks::prefs::kEditBookmarksEnabled);
@@ skipping 2327 matching lines @@
 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
     (const BookmarkNode*)node {
   // See if it's in the bar, then if it is in the hierarchy of visible
   // folder menus.
   if (bookmarkModel_->bookmark_bar_node() == node)
     return self;
   return [folderController_ controllerForNode:node];
 }
 
 @end