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

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

Issue 2708073002: Removing pre-material design menu setting. (Closed)
Patch Set: . Created 3 years, 10 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/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 d749a22b8041d1276024806a8f946c7301088e07..783bcd986327065953b99ea61249ba800e787cc1 100644
--- a/chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm
@@ -100,8 +100,7 @@ const CGFloat kFrameColorDarkUpperBound = 0.33;
// The image used in the generic button case as well as the error icon both
// need to be shifted down slightly to be centered correctly.
// TODO(noms): When the assets are fixed, remove this latter offset.
- if (!hasError_ || switches::IsMaterialDesignUserMenu())
- frame = NSOffsetRect(frame, 0, 1);
+ frame = NSOffsetRect(frame, 0, 1);
[super drawImage:image withFrame:frame inView:controlView];
}
@@ -182,8 +181,7 @@ const CGFloat kFrameColorDarkUpperBound = 0.33;
[avatarButton setBezelStyle:NSShadowlessSquareBezelStyle];
[avatarButton setButtonType:NSMomentaryChangeButton];
- if (switches::IsMaterialDesignUserMenu())
- [[avatarButton cell] setHighlightsBy:NSNoCellMask];
+ [[avatarButton cell] setHighlightsBy:NSNoCellMask];
[avatarButton setBordered:YES];
if (cocoa_l10n_util::ShouldFlipWindowControlsInRTL())

Powered by Google App Engine
This is Rietveld 408576698