Mac: Fix omnibox hint text is 1px lower than typed text.

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/metrics/histogram.h"
@@ skipping 223 matching lines @@
     // security level.  Dig in and figure out why this isn't a no-op
     // that should go away.
     EmphasizeURLComponents();
   }
 }
 
 void OmniboxViewMac::UpdatePlaceholderText() {
   if (chrome::ShouldDisplayOriginChip() ||
       OmniboxFieldTrial::DisplayHintTextWhenPossible()) {
     NSDictionary* placeholder_attributes = @{
-      NSFontAttributeName : GetFieldFont(gfx::Font::NORMAL),
       NSForegroundColorAttributeName : [NSColor disabledControlTextColor]
     };
     base::scoped_nsobject<NSMutableAttributedString> placeholder_text(
         [[NSMutableAttributedString alloc]
             initWithString:base::SysUTF16ToNSString(GetHintText())
                 attributes:placeholder_attributes]);
+    ApplyTextStyle(placeholder_text);
     [[field_ cell] setPlaceholderAttributedString:placeholder_text];
   }
 }
 
 void OmniboxViewMac::OpenMatch(const AutocompleteMatch& match,
                                WindowOpenDisposition disposition,
                                const GURL& alternate_nav_url,
                                const base::string16& pasted_text,
                                size_t selected_line) {
   // Coalesce text and selection updates from the following function. If we
@@ skipping 213 matching lines @@
     // This function can be called during the editor's -resignFirstResponder. If
     // that happens, |storage| and |field_| will not be synced automatically any
     // more. Calling -stringValue ensures that |field_| reflects the changes to
     // |storage|.
     [field_ stringValue];
   } else {
     SetText(GetText());
   }
 }
 
-void OmniboxViewMac::ApplyTextAttributes(const base::string16& display_text,
-                                         NSMutableAttributedString* as) {
-  NSUInteger as_length = [as length];
-  NSRange as_entire_string = NSMakeRange(0, as_length);
-
+void OmniboxViewMac::ApplyTextStyle(NSMutableAttributedString* as) {
   [as addAttribute:NSFontAttributeName value:GetFieldFont(gfx::Font::NORMAL)
-             range:as_entire_string];
-
-  // A kinda hacky way to add breaking at periods. This is what Safari does.
-  // This works for IDNs too, despite the "en_US".
-  [as addAttribute:@"NSLanguage" value:@"en_US_POSIX"
-             range:as_entire_string];
+             range:NSMakeRange(0, [as 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];
   [as addAttribute:NSParagraphStyleAttributeName value:paragraph_style
+             range:NSMakeRange(0, [as length])];
+}
+
+void OmniboxViewMac::ApplyTextAttributes(const base::string16& display_text,
+                                         NSMutableAttributedString* as) {
+  NSUInteger as_length = [as length];
+  NSRange as_entire_string = NSMakeRange(0, as_length);
+
+  ApplyTextStyle(as);
+
+  // A kinda hacky way to add breaking at periods. This is what Safari does.
+  // This works for IDNs too, despite the "en_US".
+  [as addAttribute:@"NSLanguage" value:@"en_US_POSIX"
              range:as_entire_string];
 
   url::Component scheme, host;
   AutocompleteInput::ParseForEmphasizeComponents(
       display_text, ChromeAutocompleteSchemeClassifier(profile()),
       &scheme, &host);
   bool grey_out_url = display_text.substr(scheme.begin, scheme.len) ==
       base::UTF8ToUTF16(extensions::kExtensionScheme);
   if (model()->CurrentTextIsURL() &&
       (host.is_nonempty() || grey_out_url)) {
@@ skipping 509 matching lines @@
 
 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();
 }