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

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

Issue 1815313002: Use colors from color_palette.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « no previous file | 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/app_toolbar_button.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
index 29445b845d3b4452aec2a2184fcc0f3bc542bbba..13cf0d7c3fab2cc7239d0b13edc3a30676528fac 100644
--- a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
+++ b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
@@ -7,6 +7,7 @@
#include "base/macros.h"
#import "chrome/browser/ui/cocoa/themed_window.h"
#import "chrome/browser/ui/cocoa/view_id_util.h"
+#include "ui/gfx/color_palette.h"
class AppMenuButtonIconPainterDelegateMac :
public AppMenuIconPainter::Delegate {
@@ -53,25 +54,18 @@ class AppMenuButtonIconPainterDelegateMac :
}
- (SkColor)vectorIconColor:(BOOL)themeIsDark {
- const SkColor normalColor = SkColorSetRGB(0x5A, 0x5A, 0x5A);
- const SkColor normalIncognitoColor = SkColorSetRGB(0xFF, 0xFF, 0xFF);
- const SkColor severityMedColor = SkColorSetRGB(0xF0, 0x93, 0x00);
- const SkColor severityMedIncognitoColor = SkColorSetRGB(0xF7, 0xCB, 0x4D);
- const SkColor severityHighColor = SkColorSetRGB(0xC5, 0x39, 0x29);
- const SkColor severityHighIncognitoColor = SkColorSetRGB(0xE6, 0x73, 0x7C);
-
switch (severity_) {
case AppMenuIconPainter::Severity::SEVERITY_NONE:
case AppMenuIconPainter::Severity::SEVERITY_LOW:
- return themeIsDark ? normalIncognitoColor : normalColor;
+ return themeIsDark ? SK_ColorWHITE : gfx::kChromeIconGrey;
break;
case AppMenuIconPainter::Severity::SEVERITY_MEDIUM:
- return themeIsDark ? severityMedIncognitoColor : severityMedColor;
+ return themeIsDark ? gfx::kGoogleYellow300 : gfx::kGoogleYellow700;
break;
case AppMenuIconPainter::Severity::SEVERITY_HIGH:
- return themeIsDark ? severityHighIncognitoColor : severityHighColor;
+ return themeIsDark ? gfx::kGoogleRed300 : gfx::kGoogleRed700;
break;
default:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698