Adjust toolbar height on Retina (Mac).

chrome/browser/ui/cocoa/toolbar/toolbar_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/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
@@ skipping 43 matching lines @@
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/omnibox_view.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/components_strings.h"
 #include "grit/theme_resources.h"
 #import "ui/base/cocoa/menu_controller.h"
+#import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 namespace {
 
 // Duration of the toolbar animation.
 const NSTimeInterval kToolBarAnimationDuration = 0.12;
 
-// Height of the toolbar in pixels when the bookmark bar is closed.
-const CGFloat kBaseToolbarHeightNormal = 35.0;
-
 // Height of the location bar. Used for animating the toolbar in and out when
 // the location bar is displayed stand-alone for bookmark apps.
 const CGFloat kLocationBarHeight = 29.0;
 
 // The padding above the toolbar elements. This is calculated from the values
 // in Toolbar.xib: the height of the toolbar (35) minus the height of the child
 // elements (29) minus the y-origin of the elements (4).
 const CGFloat kToolbarElementTopPadding = 2.0;
 
 // The minimum width of the location bar in pixels.
@@ skipping 230 matching lines @@
   [reloadButton_ setHandleMiddleClick:YES];
   [homeButton_ setHandleMiddleClick:YES];
 
   [self initCommandStatus:commands_];
   [reloadButton_ setCommandUpdater:commands_];
 
   locationBarView_.reset(new LocationBarViewMac(locationBar_, commands_,
                                                 profile_, browser_));
   [locationBar_ setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
 
+  // Adjust the toolbar height if running on Retina - see the comment in
+  // -baseToolbarHeight.
+  CGFloat toolbarHeight = [self baseToolbarHeight];
+  NSRect toolbarFrame = [[locationBar_ superview] frame];
+  if (toolbarFrame.size.height != toolbarHeight) {
+    toolbarFrame.size.height = toolbarHeight;
+    [[locationBar_ superview] setFrame:toolbarFrame];
+  }
+
   // Register pref observers for the optional home and page/options buttons
   // and then add them to the toolbar based on those prefs.
   PrefService* prefs = profile_->GetPrefs();
   showHomeButton_.Init(
       prefs::kShowHomeButton, prefs,
       base::Bind(
           &ToolbarControllerInternal::NotificationBridge::OnPreferenceChanged,
           base::Unretained(notificationBridge_.get())));
   [self showOptionalHomeButton];
   [self installAppMenu];
@@ skipping 552 matching lines @@
 }
 
 - (NSPoint)saveCreditCardBubblePoint {
   return locationBarView_->GetSaveCreditCardBubblePoint();
 }
 
 - (NSPoint)translateBubblePoint {
   return locationBarView_->GetTranslateBubblePoint();
 }
 
+- (CGFloat)baseToolbarHeight {
+  // Height of the toolbar in pixels when the bookmark bar is closed.
+  const CGFloat baseToolbarHeightNormal = 35.0;
+
+  // Not all lines are drawn at 2x normal height when running on Retina, which
+  // causes the toolbar controls to be visually 1pt too high within the toolbar
+  // area. It's not possible to adjust the control y-positions by 0.5pt and have
+  // them appear 0.5pt lower (they are still drawn at their original locations),
+  // so instead shave off 1pt from the bottom of the toolbar. Note that there's
+  // an offsetting change in -[BookmarkBarController preferredHeight] to
+  // maintain the proper spacing between bookmark icons and toolbar items. See
+  // https://crbug.com/326245 .
+  return [[self view] cr_lineWidth] == 0.5 ? baseToolbarHeightNormal - 1
+                                           : baseToolbarHeightNormal;
+}
+
 - (CGFloat)desiredHeightForCompression:(CGFloat)compressByHeight {
   // With no toolbar, just ignore the compression.
   if (!hasToolbar_)
     return NSHeight([locationBar_ frame]);
 
-  return kBaseToolbarHeightNormal - compressByHeight;
+  return [self baseToolbarHeight] - compressByHeight;
 }
 
 - (void)setDividerOpacity:(CGFloat)opacity {
   ToolbarView* toolbarView = [self toolbarView];
   [toolbarView setShowsDivider:(opacity > 0 ? YES : NO)];
   [toolbarView setDividerOpacity:opacity];
   [toolbarView setNeedsDisplay:YES];
 }
 
 - (BrowserActionsController*)browserActionsController {
@@ skipping 62 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end