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

chrome/browser/autocomplete/autocomplete_popup_view_mac.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.
 
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
@@ skipping 19 matching lines @@
 // buttons.
 const CGFloat kPopupRoundingRadius = 3.5;
 
 // Gap between the field and the popup.
 const CGFloat kPopupFieldGap = 2.0;
 
 // How opaque the popup window should be.  This matches Windows (see
 // 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;
 
 // A very short animation duration used to cancel running animations.
 const NSTimeInterval kCancelAnimationDuration = 0.00001;
 
 // Maximum fraction of the popup width that can be used to display match
 // contents.
 const float kMaxContentsFraction = 0.7;
@@ skipping 133 matching lines @@
                             ContentTextColor(), font);
 
   // If there is a description, append it, separated from the contents
   // with an en dash, and decorated with a distinct color.
   if (!match.description.empty()) {
     // Make sure the current string fits w/in kMaxContentsFraction of
     // the cell to make sure the description will be at least
     // 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);
 
     NSDictionary* attributes =
         [NSDictionary dictionaryWithObjectsAndKeys:
              font.nativeFont(), NSFontAttributeName,
              ContentTextColor(), NSForegroundColorAttributeName,
              nil];
     NSString* rawEnDash = [NSString stringWithFormat:@" %C ", 0x2013];
     NSAttributedString* enDash =
@@ skipping 278 matching lines @@
   [[self backgroundColor] set];
   NSRectFill(cellFrame);
 
   // Put the image centered vertically but in a fixed column.
   NSImage* image = [self image];
   if (image) {
     NSRect imageRect = cellFrame;
     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
              fraction:1.0
          neverFlipped:YES];
   }
 
   // Adjust the title position to be lined up under the field's text.
   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];
   }
 }
 
 @end
 
 @implementation AutocompleteMatrix
 
 
@@ skipping 184 matching lines @@
                                      yRadius:kPopupRoundingRadius];
 
   // Draw the matrix clipped to our border.
   [NSGraphicsContext saveGraphicsState];
   [path addClip];
   [super drawRect:rect];
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @end