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

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm

Issue 2013183003: [Mac][Material Design] Bring Omnibox stroke and MD colors up to spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile error. 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
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_view.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/toolbar/toolbar_button_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm
index 998748fe9f56facf1a97087ea7c7ffffdd329583..ddf3b6105337a6ef2b3b950614298d2db7c5ce45 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm
@@ -235,7 +235,11 @@ const NSSize kMDButtonIconSize = NSMakeSize(16, 16);
[[BrowserToolsImageRep alloc]
initWithDrawSelector:@selector(drawBrowserToolsIcon:)
delegate:[BrowserToolsImageRep class]];
- [imageRep setFillColor:skia::SkColorToCalibratedNSColor(fillColor)];
+ if (!ui::MaterialDesignController::IsModeMaterial()) {
+ [imageRep setFillColor:skia::SkColorToCalibratedNSColor(fillColor)];
+ } else {
+ [imageRep setFillColor:skia::SkColorToSRGBNSColor(fillColor)];
+ }
// Create the image from the image rep.
NSImage* browserToolsIcon =
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_view.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698