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

Unified Diff: chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm

Issue 2062563002: [Mac][Material]Update the text color on Guest Mode Chip (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 | « 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/profiles/avatar_button_controller.mm
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm b/chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm
index 3ee8c9f1063bbbfefbeaadaaea581e3c67f41722..2377b86d59389f9620980de11e65ff1ff571f308 100644
--- a/chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm
@@ -22,6 +22,7 @@
#include "grit/theme_resources.h"
#import "ui/base/cocoa/appkit_utils.h"
#include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/nine_image_painter_factory.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_skia_operations.h"
@@ -216,7 +217,8 @@ NSImage* GetImageFromResourceID(int resourceId) {
[shadow setShadowBlurRadius:0];
NSColor* foregroundColor;
- if (browser_->profile()->IsGuestSession()) {
+ if (browser_->profile()->IsGuestSession() &&
+ !ui::MaterialDesignController::IsModeMaterial()) {
foregroundColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.9];
[shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.4]];
} else if (!isThemedWindow_) {
« 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