[Mac] Line up omnibox popup under field.

chrome/browser/cocoa/autocomplete_text_field_cell.mm

 // Copyright (c) 2010 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/cocoa/autocomplete_text_field_cell.h"
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "gfx/font.h"
 
@@ skipping 27 matching lines @@
 // The amount of padding on either side reserved for drawing an icon.
 const NSInteger kIconHorizontalPad = 3;
 
 // How far to shift bounding box of hint icon label down from top of field.
 const NSInteger kIconLabelYOffset = 7;
 
 // How far the editor insets itself, for purposes of determining if
 // decorations need to be trimmed.
 const CGFloat kEditorHorizontalInset = 3.0;
 
-const CGFloat kLocationIconXOffset = 3.0;
+// Cause the location icon to line up above the icons in the popup.
+const CGFloat kLocationIconXOffset = 9.0;
+const CGFloat kLocationIconXPad = 5.0;
 
 // Conveniences to centralize width+offset calculations.
 CGFloat WidthForHint(NSAttributedString* hintString) {
   return kHintXOffset + ceil([hintString size].width);
 }
 CGFloat WidthForKeyword(NSAttributedString* keywordString) {
   return kKeywordXOffset + ceil([keywordString size].width) +
       2 * kKeywordTokenInset;
 }
 
@@ skipping 222 matching lines @@
 
 // Overriden to account for the hint strings and hint icons.
 - (NSRect)textFrameForFrame:(NSRect)cellFrame {
   NSRect textFrame([super textFrameForFrame:cellFrame]);
 
   // TODO(shess): Check the set of exclusions in |LocationBarViewMac|.
   // If |keywordString_| takes precedence over other cases, then this
   // code could be made simpler.
   if (!keywordString_ && locationIconView_ && locationIconView_->IsVisible()) {
     const NSSize imageSize = locationIconView_->GetImageSize();
-    textFrame.origin.x += imageSize.width;
-    textFrame.size.width -= imageSize.width;
+    const CGFloat locationIconWidth =
+        kLocationIconXOffset + kLocationIconXPad + imageSize.width;
+    textFrame.origin.x += locationIconWidth;
+    textFrame.size.width -= locationIconWidth;
   }
 
   if (hintString_) {
     DCHECK(!keywordString_);
     const CGFloat hintWidth(WidthForHint(hintString_));
 
     // TODO(shess): This could be better.  Show the hint until the
     // non-hint text bumps against it?
     if (hintWidth < NSWidth(textFrame)) {
       textFrame.size.width -= hintWidth;
@@ skipping 219 matching lines @@
       icon = [self iconForEvent:theEvent inRect:cellFrame ofView:controlView];
   if (icon) {
     [icon view]->OnMousePressed([icon rect]);
     return YES;
   }
 
   return NO;
 }
 
 @end