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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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 | « no previous file | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index e6ed06649fe9b529707424274fd62649872f9845..043e0d7882261774aae4960ccab76ccb4b70fdd0 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -1137,7 +1137,7 @@ CGFloat BookmarkRightMargin() {
CGFloat lineWidth = 0;
BOOL isRetina = NO;
- BOOL reduceHeight = YES;
+ BOOL reduceHeight = NO;
switch (currentState_) {
case BookmarkBar::SHOW:
@@ -1149,10 +1149,9 @@ CGFloat BookmarkRightMargin() {
lineWidth = [[self view] cr_lineWidth];
isRetina = (lineWidth < 1);
- // If Material Design and Retina, no height adjustment is needed.
- if (ui::MaterialDesignController::IsModeMaterial() && isRetina) {
- reduceHeight = NO;
- }
+ // Only adjust the height if Retina and not Material Design.
+ reduceHeight =
+ isRetina && !ui::MaterialDesignController::IsModeMaterial();
return reduceHeight ? chrome::kBookmarkBarHeight + 1
: chrome::kBookmarkBarHeight;
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698