Merge 54410 - [Mac] Un-tweak omnibox height and spacing and font....

chrome/browser/cocoa/location_bar/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/location_bar/autocomplete_text_field_cell.h"
 
 #include "base/logging.h"
 #import "chrome/browser/cocoa/image_utils.h"
 #import "chrome/browser/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/location_bar/location_bar_decoration.h"
 
 namespace {
 
 const CGFloat kBaselineAdjust = 3.0;
 
 // Matches the clipping radius of |GradientButtonCell|.
 const CGFloat kCornerRadius = 4.0;
 
 // How far to inset the left-hand decorations from the field's bounds.
-const CGFloat kLeftDecorationXOffset = 4.0;
+const CGFloat kLeftDecorationXOffset = 5.0;
 
 // How far to inset the right-hand decorations from the field's bounds.
 // TODO(shess): Why is this different from |kLeftDecorationXOffset|?
-const CGFloat kRightDecorationXOffset = 4.0;
+// |kDecorationOuterXOffset|?
+const CGFloat kRightDecorationXOffset = 5.0;
 
 // The amount of padding on either side reserved for drawing
 // decorations.  [Views has |kItemPadding| == 3.]
 const CGFloat kDecorationHorizontalPad = 3.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
@@ skipping 357 matching lines @@
                             &decorations, &decorationFrames, &textFrame);
 
   for (size_t i = 0; i < decorations.size(); ++i) {
     NSString* tooltip = decorations[i]->GetToolTip();
     if ([tooltip length] > 0)
       [controlView addToolTip:tooltip forRect:decorationFrames[i]];
   }
 }
 
 @end