Adjust toolbar height on Retina (Mac).

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>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/sdk_forward_declarations.h"
@@ skipping 45 matching lines @@
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/prefs/pref_service.h"
 #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"
 #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/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;
@@ skipping 958 matching lines @@
 }
 
 - (int)preferredHeight {
   DCHECK(![self isAnimationRunning]);
 
   if (!barIsEnabled_)
     return 0;
 
   switch (currentState_) {
     case BookmarkBar::SHOW:
-      return chrome::kBookmarkBarHeight;
+      // When on a Retina display the toolbar is 1pt shorter than normal so the
+      // bookmark bar needs to be 1pt taller in order for the bookmark icons to
+      // appear in the right place. See https://crbug.com/326245 .

[Alexei Svitkine (slow), 2016/02/23 01:20:34]

Nit: Please make this comment refer to the change in toolbar_controller.mm and
make those comments point back here.

[shrike, 2016/02/23 01:23:54]

If I understand you correctly, you are saying that the comments in each file
should point back to each other?

+      return [[self view] cr_lineWidth] == 0.5 ? 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