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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button.h" 5 #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #import "chrome/browser/ui/cocoa/themed_window.h" 8 #import "chrome/browser/ui/cocoa/themed_window.h"
9 #import "chrome/browser/ui/cocoa/view_id_util.h" 9 #import "chrome/browser/ui/cocoa/view_id_util.h"
10 10
(...skipping 30 matching lines...) Expand all
41 - (void)awakeFromNib { 41 - (void)awakeFromNib {
42 [self commonInit]; 42 [self commonInit];
43 } 43 }
44 44
45 - (void)commonInit { 45 - (void)commonInit {
46 view_id_util::SetID(self, VIEW_ID_APP_MENU); 46 view_id_util::SetID(self, VIEW_ID_APP_MENU);
47 delegate_.reset(new AppMenuButtonIconPainterDelegateMac(self)); 47 delegate_.reset(new AppMenuButtonIconPainterDelegateMac(self));
48 severity_ = AppMenuIconPainter::Severity::SEVERITY_NONE; 48 severity_ = AppMenuIconPainter::Severity::SEVERITY_NONE;
49 } 49 }
50 50
51 - (SkColor)iconColor:(BOOL)themeIsDark { 51 - (gfx::VectorIconId)vectorIconId {
52 return gfx::VectorIconId::BROWSER_TOOLS;
53 }
54
55 - (SkColor)vectorIconColor:(BOOL)themeIsDark {
52 const SkColor normalColor = SkColorSetRGB(0x5A, 0x5A, 0x5A); 56 const SkColor normalColor = SkColorSetRGB(0x5A, 0x5A, 0x5A);
53 const SkColor normalIncognitoColor = SkColorSetRGB(0xFF, 0xFF, 0xFF); 57 const SkColor normalIncognitoColor = SkColorSetRGB(0xFF, 0xFF, 0xFF);
54 const SkColor severityMedColor = SkColorSetRGB(0xF0, 0x93, 0x00); 58 const SkColor severityMedColor = SkColorSetRGB(0xF0, 0x93, 0x00);
55 const SkColor severityMedIncognitoColor = SkColorSetRGB(0xF7, 0xCB, 0x4D); 59 const SkColor severityMedIncognitoColor = SkColorSetRGB(0xF7, 0xCB, 0x4D);
56 const SkColor severityHighColor = SkColorSetRGB(0xC5, 0x39, 0x29); 60 const SkColor severityHighColor = SkColorSetRGB(0xC5, 0x39, 0x29);
57 const SkColor severityHighIncognitoColor = SkColorSetRGB(0xE6, 0x73, 0x7C); 61 const SkColor severityHighIncognitoColor = SkColorSetRGB(0xE6, 0x73, 0x7C);
58 62
59 switch (severity_) { 63 switch (severity_) {
60 case AppMenuIconPainter::Severity::SEVERITY_NONE: 64 case AppMenuIconPainter::Severity::SEVERITY_NONE:
61 case AppMenuIconPainter::Severity::SEVERITY_LOW: 65 case AppMenuIconPainter::Severity::SEVERITY_LOW:
(...skipping 10 matching lines...) Expand all
72 76
73 default: 77 default:
74 break; 78 break;
75 } 79 }
76 } 80 }
77 81
78 - (void)setSeverity:(AppMenuIconPainter::Severity)severity 82 - (void)setSeverity:(AppMenuIconPainter::Severity)severity
79 shouldAnimate:(BOOL)shouldAnimate { 83 shouldAnimate:(BOOL)shouldAnimate {
80 if (severity != severity_) { 84 if (severity != severity_) {
81 severity_ = severity; 85 severity_ = severity;
82 [self setImagesFromIconId:gfx::VectorIconId::BROWSER_TOOLS]; 86 // Update the button state images with the new severity color.
83 [self setNeedsDisplay:YES]; 87 [self resetButtonStateImages];
84 } 88 }
85 } 89 }
86 90
87 @end 91 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698