Align the Mac Omnibox items vertically again.

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #include "components/omnibox/browser/omnibox_view.h"
 #include "components/security_state/security_state_model.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/font.h"
 
 class CommandUpdater;
 class OmniboxPopupView;
 class Profile;
 
 namespace content {
 class WebContents;
 }
 
 namespace ui {
@@ skipping 90 matching lines @@
   void OnSetFocus(bool control_down) override;
   void OnKillFocus() override;
   void OnMouseDown(NSInteger button_number) override;
   bool ShouldSelectAllOnMouseDown() override;
 
   // Helper for LocationBarViewMac.  Optionally selects all in |field_|.
   void FocusLocation(bool select_all);
 
   // Helper to get the font to use in the field, exposed for the
   // popup.
-  static NSFont* GetNormalFieldFont();
-  static NSFont* GetBoldFieldFont();
-  static NSFont* GetLargeFont();
-  static NSFont* GetSmallFont();
+  // The |style| parameter specifies the new style for the font, and is a
+  // bitmask of the values ITALIC and UNDERLINE (see ui/gfx/font.h).
+  static NSFont* GetFieldFont(int style, gfx::Font::Weight weight);
+  static NSFont* GetLargeFont(int style, gfx::Font::Weight weight);
+  static NSFont* GetSmallFont(int style, gfx::Font::Weight weight);
 
   // If |resource_id| has a PDF image which can be used, return it.
   // Otherwise return the PNG image from the resource bundle.
   static NSImage* ImageForResource(int resource_id);
 
   // Color used to draw suggest text.
   static NSColor* SuggestTextColor();
 
   AutocompleteTextField* field() const { return field_; }
 
@@ skipping 89 matching lines @@
   NSRange coalesced_range_update_;
 
   // The time of the first character insert operation that has not yet been
   // painted. Used to measure omnibox responsiveness with a histogram.
   base::TimeTicks insert_char_time_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_