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

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

Issue 2072833002: [Material][Mac] Replace the default favicon with a vector (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 6 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
« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 3fdfe3bf78b475bb30126945746445036a6f30be..99611e5fd0c23b5155c82e86f924408ca6959286 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -1505,7 +1505,12 @@ private:
if (icon)
image = skia::SkBitmapToNSImageWithColorSpace(*icon, colorSpace);
} else {
- image = mac::FaviconForWebContents(contents);
+ TabController* tab = [tabArray_ firstObject];
+ NSColor* titleColor = [[tab tabView] titleColor];
+ NSColor* deviceColor =
+ [titleColor colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
+ image = mac::FaviconForWebContents(
+ contents, skia::NSDeviceColorToSkColor(deviceColor));
}
// Either we don't have a valid favicon or there was some issue converting it
« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698