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

chrome/browser/cocoa/location_bar/bubble_decoration.mm

Index: chrome/browser/cocoa/location_bar/bubble_decoration.mm
===================================================================
--- chrome/browser/cocoa/location_bar/bubble_decoration.mm	(revision 54686)
+++ chrome/browser/cocoa/location_bar/bubble_decoration.mm	(working copy)
@@ -19,7 +19,7 @@
 // to differ from the location icon's.  Indeed, that's how the views
 // implementation handles the problem.  This draws the bubble edge a
 // little bit further left, which is easier but no less hacky.
-const CGFloat kLeftSideOverdraw = 1.0;
+const CGFloat kLeftSideOverdraw = 2.0;
 
 // Omnibox corner radius is |4.0|, this needs to look tight WRT that.
 const CGFloat kBubbleCornerRadius = 2.0;
@@ -31,9 +31,6 @@
 // reflect the single pixel space w/in that.
 const CGFloat kBubbleYInset = 4.0;
 
-// How far to inset the text from the edge of the bubble.
-const CGFloat kTextYInset = 1.0;
-
 }  // namespace
 
 BubbleDecoration::BubbleDecoration(NSFont* font) {
@@ -129,7 +126,6 @@
     NSRect textRect = decorationFrame;
     textRect.origin.x = NSMaxX(imageRect);
     textRect.size.width = NSMaxX(decorationFrame) - NSMinX(textRect);
-    textRect.origin.y += kTextYInset;
     [label_ drawInRect:textRect withAttributes:attributes_];
   }
 }