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

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

Issue 1986083003: [Mac][Material Design] Fix toolbar height regression. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm ('k') | 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/toolbar_controller.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index 7e289b053955f090c26b186f9f1382270b13093a..ddd366370c8733fa8558cae1b695d189c1e5a81d 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -1068,12 +1068,10 @@ class NotificationBridge : public AppMenuBadgeController::Delegate {
// https://crbug.com/326245 .
const CGFloat kLineWidth = [[self view] cr_lineWidth];
const BOOL kIsRetina = (kLineWidth < 1);
- BOOL reduceHeight = YES;
+ BOOL reduceHeight = NO;
- // If Material Design and Retina, no height adjustment is needed.
- if (kIsModeMaterial && kIsRetina) {
- reduceHeight = NO;
- }
+ // Only adjust the height if Retina and not Material Design.
+ reduceHeight = kIsRetina && !kIsModeMaterial;
return reduceHeight ? kBaseToolbarHeightNormal - 1
: kBaseToolbarHeightNormal;
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698