Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3839)

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

Issue 1993313002: [Mac][Material Design] Show light default favicon in Incognito mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index e6ed06649fe9b529707424274fd62649872f9845..cd9364d35d3b24cd1dcf9d5ad6867b77c1f3262c 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -315,9 +315,21 @@ CGFloat BookmarkRightMargin() {
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;
@@ -706,7 +718,7 @@ CGFloat BookmarkRightMargin() {
- (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()) {
@@ -746,7 +758,7 @@ CGFloat BookmarkRightMargin() {
if (!favicon.IsEmpty())
return favicon.ToNSImage();
- return defaultImage_;
+ return forADarkTheme ? defaultImageIncognito_ : defaultImage_;
}
- (void)closeFolderAndStopTrackingMenus {
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698