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

chrome/browser/cocoa/location_bar/bubble_decoration.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 <cmath>
 
 #import "chrome/browser/cocoa/location_bar/bubble_decoration.h"
 
 #include "base/logging.h"
 #import "chrome/browser/cocoa/image_utils.h"
 
 namespace {
 
 // Padding between the icon/label and bubble edges.
 const CGFloat kBubblePadding = 3.0;
 
 // The image needs to be in the same position as for the location
 // icon, which implies that the bubble's padding in the Omnibox needs
 // 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;
 
 // How far to inset the bubble from the top and bottom of the drawing
 // frame.
 // TODO(shess): Would be nicer to have the drawing code factor out the
 // space outside the border, and perhaps the border.  Then this could
 // 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) {
   DCHECK(font);
   if (font) {
     NSDictionary* attributes =
         [NSDictionary dictionaryWithObject:font
                                     forKey:NSFontAttributeName];
     attributes_.reset([attributes retain]);
   }
@@ skipping 75 matching lines @@
               fraction:1.0
           neverFlipped:YES];
   } else {
     imageRect.size = NSZeroSize;
   }
 
   if (label_) {
     NSRect textRect = decorationFrame;
     textRect.origin.x = NSMaxX(imageRect);
     textRect.size.width = NSMaxX(decorationFrame) - NSMinX(textRect);
-    textRect.origin.y += kTextYInset;
     [label_ drawInRect:textRect withAttributes:attributes_];
   }
 }
 
 NSImage* BubbleDecoration::GetImage() {
   return image_;
 }
 
 void BubbleDecoration::SetImage(NSImage* image) {
   image_.reset([image retain]);
@@ skipping 10 matching lines @@
 void BubbleDecoration::SetColors(NSColor* border_color,
                                  NSColor* background_color,
                                  NSColor* text_color) {
   border_color_.reset([border_color retain]);
   background_color_.reset([background_color retain]);
 
   scoped_nsobject<NSMutableDictionary> attributes([attributes_ mutableCopy]);
   [attributes setObject:text_color forKey:NSForegroundColorAttributeName];
   attributes_.reset([attributes copy]);
 }