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

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

Issue 1770573002: Update extension buttons to Material Design (Mac). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md_toolbar
Patch Set: Code clean-up. 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
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 fdf184198f7880d7c72fdcb3df4836abb7da2d13..29445b845d3b4452aec2a2184fcc0f3bc542bbba 100644
--- a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
+++ b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
@@ -48,7 +48,11 @@ class AppMenuButtonIconPainterDelegateMac :
severity_ = AppMenuIconPainter::Severity::SEVERITY_NONE;
}
-- (SkColor)iconColor:(BOOL)themeIsDark {
+- (gfx::VectorIconId)vectorIconId {
+ return gfx::VectorIconId::BROWSER_TOOLS;
+}
+
+- (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);
@@ -79,8 +83,8 @@ class AppMenuButtonIconPainterDelegateMac :
shouldAnimate:(BOOL)shouldAnimate {
if (severity != severity_) {
severity_ = severity;
- [self setImagesFromIconId:gfx::VectorIconId::BROWSER_TOOLS];
- [self setNeedsDisplay:YES];
+ // Update the button state images with the new severity color.
+ [self resetButtonStateImages];
}
}

Powered by Google App Engine
This is Rietveld 408576698