[Mac] Line up omnibox field icons and text with popup.

chrome/browser/autocomplete/autocomplete_popup_view_mac.mm

Index: chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
index d41685b9f284f0535a3522ef5e84d9e92b70c0d4..8319f00803c70b2a10290c82e22e92203d13eaf9 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
@@ -37,11 +37,11 @@ const CGFloat kPopupFieldGap = 2.0;
 // autocomplete_popup_contents_view.cc, kGlassPopupTransparency).
 const CGFloat kPopupAlpha = 240.0 / 255.0;
 
-// How much space to leave for the left and right margins.
-const CGFloat kLeftRightMargin = 5.0;
+// How far to offset image column from the left.
+const CGFloat kImageXOffset = 2.0;
 
 // How far to offset the text column from the left.
-const CGFloat kTextXOffset = 29.0;
+const CGFloat kTextXOffset = 25.0;
 
 // Animation duration when animating the popup window smaller.
 const NSTimeInterval kShrinkAnimationDuration = 0.1;
@@ -195,7 +195,7 @@ NSAttributedString* AutocompletePopupViewMac::MatchText(
     // partially visible.
     // TODO(shess): Consider revising our NSCell subclass to have two
     // bits and just draw them right, rather than truncating here.
-    const float textWidth = cellWidth - kTextXOffset - kLeftRightMargin;
+    const float textWidth = cellWidth - kTextXOffset;
     as = ElideString(as, match.contents, font,
                      textWidth * kMaxContentsFraction);
 
@@ -494,7 +494,7 @@ void AutocompletePopupViewMac::OpenURLForRow(int row, bool force_background) {
     imageRect.size = [image size];
     imageRect.origin.y += kImageBaselineAdjust +
         floor((NSHeight(cellFrame) - NSHeight(imageRect)) / 2);
-    imageRect.origin.x += kLeftRightMargin;
+    imageRect.origin.x += kImageXOffset;
     [image drawInRect:imageRect
              fromRect:NSZeroRect  // Entire image
             operation:NSCompositeSourceOver
@@ -506,7 +506,7 @@ void AutocompletePopupViewMac::OpenURLForRow(int row, bool force_background) {
   NSAttributedString* title = [self attributedTitle];
   if (title) {
     NSRect titleRect = cellFrame;
-    titleRect.size.width -= (kTextXOffset + kLeftRightMargin);
+    titleRect.size.width -= kTextXOffset;
     titleRect.origin.x += kTextXOffset;
     [self drawTitle:title withFrame:titleRect inView:controlView];
   }