[Mac] Fix omnibox text overlap

chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.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.
 
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
@@ skipping 18 matching lines @@
 
 // Matches the clipping radius of |GradientButtonCell|.
 const CGFloat kCornerRadius = 3.0;
 
 // How far to inset the left- and right-hand decorations from the field's
 // bounds.
 const CGFloat kRightDecorationXOffset = 2.0;
 const CGFloat kLeftDecorationXOffset = 1.0;
 
 // How much the text frame needs to overlap the rightmost left decoration.
-const CGFloat kTextFrameDecorationOverlap = 5.0;
+const CGFloat kTextFrameDecorationOverlap = 4.0;
+
+// How much the text in the cell should be offset from its left.
+const CGFloat kTitleFrameXOffset = 1.0;
 
 // How long to wait for mouse-up on the location icon before assuming
 // that the user wants to drag.
 const NSTimeInterval kLocationIconDragTimeout = 0.25;
 
 // Calculate the positions for a set of decorations.  |frame| is the
 // overall frame to do layout in, |remaining_frame| will get the
 // left-over space.  |all_decorations| is the set of decorations to
 // lay out, |decorations| will be set to the decorations which are
 // visible and which fit, in the same order as |all_decorations|,
@@ skipping 338 matching lines @@
       decorations[i]->DrawWithBackgroundInFrame(decorationFrames[i],
                                                 controlView);
     }
   }
 
   // NOTE: This function must closely match the logic in
   // |-textFrameForFrame:|.
 
   // Superclass draws text portion WRT original |cellFrame|.
   ui::ScopedCGContextSmoothFonts fontSmoothing;
-  [super drawInteriorWithFrame:cellFrame inView:controlView];
+  NSAttributedString* attrString = self.attributedStringValue;
+  [attrString drawInRect:[self titleRectForBounds:cellFrame]];
+}
+
+- (NSRect)titleRectForBounds:(NSRect)rect {
+  NSRect titleRect = [super titleRectForBounds:rect];
+  titleRect.origin.x += kTitleFrameXOffset;
+  titleRect.size.width -= kTitleFrameXOffset;
+  return titleRect;
 }
 
 - (BOOL)canDropAtLocationInWindow:(NSPoint)location
                            ofView:(AutocompleteTextField*)controlView {
   NSRect cellFrame = [controlView bounds];
   const NSPoint locationInView =
       [controlView convertPoint:location fromView:nil];
 
   // If we have decorations, the drop can't occur at their horizontal padding.
   if (!leftDecorations_.empty() && locationInView.x < kLeftDecorationXOffset)
@@ skipping 296 matching lines @@
 
 @end
 
 @implementation AutocompleteTextFieldCell (TestingAPI)
 
 - (const std::vector<LocationBarDecoration*>&)mouseTrackingDecorations {
   return mouseTrackingDecorations_;
 }
 
 @end