Align the Mac Omnibox items vertically again.

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.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.
 
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 25 matching lines @@
 #include "grit/theme_resources.h"
 #import "skia/ext/skia_utils_mac.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/clipboard_util_mac.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #import "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/color_palette.h"
-#include "ui/gfx/font.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
 
 // TODO(ellyjones): Remove this when the deployment target is 10.9 or later.
 extern NSString* const NSAccessibilityPriorityKey;
 
 using content::WebContents;
 
 // Focus-handling between |field_| and model() is a bit subtle.
 // Other platforms detect change of focus, which is inconvenient
@@ skipping 14 matching lines @@
 //
 // Other platforms don't appear to have the sense of "key window" that
 // Mac does (I believe their fields lose focus when the window loses
 // focus).  Rather than modifying focus outside the control's edit
 // scope, when the window resigns key the autocomplete popup is
 // closed.  model() still believes it has focus, and the popup will
 // be regenerated on the user's next edit.  That seems to match how
 // things work on other platforms.
 
 namespace {
-const int kOmniboxLargeFontSizeDelta = 9;
-const int kOmniboxNormalFontSizeDelta = 1;
-const int kOmniboxSmallFontSizeDelta = 0;
-const int kOmniboxSmallMaterialFontSizeDelta = -1;
 
 // TODO(shess): This is ugly, find a better way.  Using it right now
 // so that I can crib from gtk and still be able to see that I'm using
 // the same values easily.
 NSColor* ColorWithRGBBytes(int rr, int gg, int bb) {
   DCHECK_LE(rr, 255);
   DCHECK_LE(bb, 255);
   DCHECK_LE(gg, 255);
   return [NSColor colorWithCalibratedRed:static_cast<float>(rr)/255.0
                                    green:static_cast<float>(gg)/255.0
@@ skipping 447 matching lines @@
     // more. Calling -stringValue ensures that |field_| reflects the changes to
     // |storage|.
     [field_ stringValue];
   } else {
     SetText(GetText());
   }
 }
 
 void OmniboxViewMac::ApplyTextStyle(
     NSMutableAttributedString* attributedString) {
-  [attributedString addAttribute:NSFontAttributeName
-                           value:GetNormalFieldFont()
-                           range:NSMakeRange(0, [attributedString length])];
+  [attributedString
+      addAttribute:NSFontAttributeName
+             value:GetFieldFont(gfx::Font::NORMAL, gfx::Font::Weight::NORMAL)
+             range:NSMakeRange(0, [attributedString length])];
 
   // Make a paragraph style locking in the standard line height as the maximum,
   // otherwise the baseline may shift "downwards".
   base::scoped_nsobject<NSMutableParagraphStyle> paragraph_style(
       [[NSMutableParagraphStyle alloc] init]);
   CGFloat line_height = [[field_ cell] lineHeight];
   [paragraph_style setMaximumLineHeight:line_height];
   [paragraph_style setMinimumLineHeight:line_height];
   [paragraph_style setLineBreakMode:NSLineBreakByTruncatingTail];
   [attributedString addAttribute:NSParagraphStyleAttributeName
@@ skipping 512 matching lines @@
     // If the text field has a field editor, it's the first responder, meaning
     // that it's already focused. makeFirstResponder: will select all, so only
     // call it if this behavior is desired.
     if (select_all || ![field_ currentEditor])
       [[field_ window] makeFirstResponder:field_];
     DCHECK_EQ([field_ currentEditor], [[field_ window] firstResponder]);
   }
 }
 
 // static
-NSFont* OmniboxViewMac::GetNormalFieldFont() {
+NSFont* OmniboxViewMac::GetFieldFont(int style, gfx::Font::Weight weight) {
+  // This value should be kept in sync with InstantPage::InitializeFonts.
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  return rb
-      .GetFontWithDelta(kOmniboxNormalFontSizeDelta, gfx::Font::NORMAL,
-                        gfx::Font::Weight::NORMAL)
+  return rb.GetFontList(ui::ResourceBundle::BaseFont)
+      .Derive(1, style, weight)
+      .GetPrimaryFont()
       .GetNativeFont();
 }
 
-NSFont* OmniboxViewMac::GetBoldFieldFont() {
+NSFont* OmniboxViewMac::GetLargeFont(int style, gfx::Font::Weight weight) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  return rb

[tapted, 2016/06/14 05:51:34]

So the minimal fix seems to be to do

  // Request a bold font, then make it larger. ResourceBundle will do the
  // opposite which makes a large system normal font a non-system bold font.
  // That gives a different baseline to making the non-system bold font larger.
  // And while the omnibox locks the baseline in ApplyTextStyle(),
  // OmniboxPopupCellData does not.
  return rb
      .GetFontWithDelta(0, gfx::Font::NORMAL, gfx::Font::Weight::BOLD)
      .Derive(kOmniboxNormalFontSizeDelta, gfx::Font::NORMAL,
              gfx::Font::Weight::BOLD)
      .GetNativeFont();

-      .GetFontWithDelta(kOmniboxNormalFontSizeDelta, gfx::Font::NORMAL,
-                        gfx::Font::Weight::BOLD)
+  return rb.GetFontList(ui::ResourceBundle::LargeFont)
+      .Derive(1, style, weight)
+      .GetPrimaryFont()
       .GetNativeFont();
 }
 
-NSFont* OmniboxViewMac::GetLargeFont() {
+NSFont* OmniboxViewMac::GetSmallFont(int style, gfx::Font::Weight weight) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  return rb
-      .GetFontWithDelta(kOmniboxLargeFontSizeDelta, gfx::Font::NORMAL,
-                        gfx::Font::Weight::NORMAL)
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    return rb.GetFontList(ui::ResourceBundle::SmallFont)
+        .Derive(1, style, weight)
+        .GetPrimaryFont()
+        .GetNativeFont();
+  }
+  return rb.GetFontListWithDelta(-2, gfx::Font::NORMAL)
+      .Derive(1, style, weight)
+      .GetPrimaryFont()
       .GetNativeFont();
 }
 
-NSFont* OmniboxViewMac::GetSmallFont() {
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return rb
-        .GetFontWithDelta(kOmniboxSmallFontSizeDelta, gfx::Font::NORMAL,
-                          gfx::Font::Weight::NORMAL)
-        .GetNativeFont();
-  }
-
-  return rb
-      .GetFontWithDelta(kOmniboxSmallMaterialFontSizeDelta, gfx::Font::NORMAL,
-                        gfx::Font::Weight::NORMAL)
-      .GetNativeFont();
-}
-
 int OmniboxViewMac::GetOmniboxTextLength() const {
   return static_cast<int>(GetTextLength());
 }
 
 NSUInteger OmniboxViewMac::GetTextLength() const {
   return [field_ currentEditor] ?  [[[field_ currentEditor] string] length] :
                                    [[field_ stringValue] length];
 }
 
 bool OmniboxViewMac::IsCaretAtEnd() const {
   const NSRange selection = GetSelectedRange();
   return NSMaxRange(selection) == GetTextLength();
 }
 
 void OmniboxViewMac::AnnounceAutocompleteForScreenReader(
     const base::string16& display_text) {
   NSString* announcement =
       l10n_util::GetNSStringF(IDS_ANNOUNCEMENT_COMPLETION_AVAILABLE_MAC,
                               display_text);
   NSDictionary* notification_info = @{
       NSAccessibilityAnnouncementKey : announcement,
       NSAccessibilityPriorityKey :     @(NSAccessibilityPriorityHigh)
   };
   NSAccessibilityPostNotificationWithUserInfo(
       [field_ window],
       NSAccessibilityAnnouncementRequestedNotification,
       notification_info);
 }