Add some extra height to bookmark bar if the font wants to be larger

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 
 #include <stddef.h>
 
 #import "base/mac/bundle_locations.h"
 #import "base/mac/foundation_util.h"
@@ skipping 1078 matching lines @@
 
 // (Private)
 - (BOOL)doBookmarkBarAnimation {
   BookmarkBarToolbarView* view = [self controlledView];
   if ([self isAnimatingFromState:BookmarkBar::HIDDEN
                          toState:BookmarkBar::SHOW]) {
     [view setShowsDivider:YES];
     [view setHidden:NO];
     // Height takes into account the extra height we have since the toolbar
     // only compresses when we're done.
-    [view animateToNewHeight:(chrome::kBookmarkBarHeight -
+    [view animateToNewHeight:(chrome::kMinimumBookmarkBarHeight -
                               bookmarks::kBookmarkBarOverlap)
                     duration:kBookmarkBarAnimationDuration];
   } else if ([self isAnimatingFromState:BookmarkBar::SHOW
                                 toState:BookmarkBar::HIDDEN]) {
     [view setShowsDivider:YES];
     [view setHidden:NO];
     [view animateToNewHeight:0
                     duration:kBookmarkBarAnimationDuration];
   } else if ([self isAnimatingFromState:BookmarkBar::SHOW
                                 toState:BookmarkBar::DETACHED]) {
     [view setShowsDivider:YES];
     [view setHidden:NO];
-    [view animateToNewHeight:chrome::kNTPBookmarkBarHeight
+    [view animateToNewHeight:chrome::kNTPMinimumBookmarkBarHeight
                     duration:kBookmarkBarAnimationDuration];
   } else if ([self isAnimatingFromState:BookmarkBar::DETACHED
                                 toState:BookmarkBar::SHOW]) {
     [view setShowsDivider:YES];
     [view setHidden:NO];
     // Height takes into account the extra height we have since the toolbar
     // only compresses when we're done.
-    [view animateToNewHeight:(chrome::kBookmarkBarHeight -
+    [view animateToNewHeight:(chrome::kMinimumBookmarkBarHeight -
                               bookmarks::kBookmarkBarOverlap)
                     duration:kBookmarkBarAnimationDuration];
   } else {
     // Oops! An animation we don't know how to handle.
     return NO;
   }
 
   return YES;
 }
 
@@ skipping 28 matching lines @@
       // toolbar by 1pt. In this case the bookmark bar needs to add 1pt of space
       // above the bookmark icons in order to maintain the proper distance from
       // toolbar items. See https://crbug.com/326245 .
       lineWidth = [[self view] cr_lineWidth];
       isRetina = (lineWidth < 1);
 
       // Only adjust the height if Retina and not Material Design.
       reduceHeight =
           isRetina && !ui::MaterialDesignController::IsModeMaterial();
 
-      return reduceHeight ? chrome::kBookmarkBarHeight + 1
-                          : chrome::kBookmarkBarHeight;
+      return reduceHeight ? chrome::kMinimumBookmarkBarHeight + 1
+                          : chrome::kMinimumBookmarkBarHeight;
     case BookmarkBar::DETACHED:
-      return chrome::kNTPBookmarkBarHeight;
+      return chrome::kNTPMinimumBookmarkBarHeight;
     case BookmarkBar::HIDDEN:
       return 0;
   }
 }
 
 // Recursively add the given bookmark node and all its children to
 // menu, one menu item per node.
 - (void)addNode:(const BookmarkNode*)child toMenu:(NSMenu*)menu {
   NSString* title = [BookmarkMenuCocoaController menuTitleForNode:child];
   NSMenuItem* item = [[[NSMenuItem alloc] initWithTitle:title
@@ skipping 1907 matching lines @@
 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
     (const BookmarkNode*)node {
   // See if it's in the bar, then if it is in the hierarchy of visible
   // folder menus.
   if (bookmarkModel_->bookmark_bar_node() == node)
     return self;
   return [folderController_ controllerForNode:node];
 }
 
 @end