[Mac][Material Design] Fix toolbar height on Retina.

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 49 matching lines @@
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "grit/theme_resources.h"
 #include "ui/base/clipboard/clipboard_util_mac.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/resources/grit/ui_resources.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 using bookmarks::BookmarkNodeData;
 using content::OpenURLParams;
 using content::Referrer;
@@ skipping 942 matching lines @@
   seedId_ = 0;
   menuTagMap_.clear();
 }
 
 - (int)preferredHeight {
   DCHECK(![self isAnimationRunning]);
 
   if (!barIsEnabled_)
     return 0;
 
+  CGFloat lineWidth = 0;
+  BOOL isRetina = NO;
+  BOOL reduceHeight = YES;
+
   switch (currentState_) {
     case BookmarkBar::SHOW:
-      // When on a Retina display, -[ToolbarContrller baseToolbarHeight] reduces
-      // the height of the toolbar by 1pt. In this case the bookmark bar needs
-      // to be 1pt taller to maintain the proper spacing between bookmark icons
-      // and toolbar items. See https://crbug.com/326245 .
-      return [[self view] cr_lineWidth] == 0.5 ? chrome::kBookmarkBarHeight + 1
-                                               : chrome::kBookmarkBarHeight;
+      // 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;
+      }
+
+      return reduceHeight ? chrome::kBookmarkBarHeight + 1
+                          : chrome::kBookmarkBarHeight;
     case BookmarkBar::DETACHED:
       return chrome::kNTPBookmarkBarHeight;
     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 {
@@ skipping 1890 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