[Mac][Material Design] Fix toolbar height regression.

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 1119 matching lines @@
 }
 
 - (int)preferredHeight {
   DCHECK(![self isAnimationRunning]);
 
   if (!barIsEnabled_)
     return 0;
 
   CGFloat lineWidth = 0;
   BOOL isRetina = NO;
-  BOOL reduceHeight = YES;
+  BOOL reduceHeight = NO;
 
   switch (currentState_) {
     case BookmarkBar::SHOW:
       // When on a Retina display and not using Material Design,
       // -[ToolbarController baseToolbarHeight] reduces the height of the
       // 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);
 
-      // 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;
     case BookmarkBar::DETACHED:
       return chrome::kNTPBookmarkBarHeight;
     case BookmarkBar::HIDDEN:
       return 0;
   }
 }
 
@@ skipping 1921 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