Alternate NTP: Add search token to omnibox

chrome/browser/ui/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/ui/cocoa/location_bar/bubble_decoration.h"
 
 #include "base/logging.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 = 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;
-
 // Padding between the icon and label.
 const CGFloat kIconLabelPadding = 4.0;
 
 }  // namespace
 
 BubbleDecoration::BubbleDecoration(NSFont* font) {
   DCHECK(font);
   if (font) {
     NSDictionary* attributes =
         [NSDictionary dictionaryWithObject:font
@@ skipping 16 matching lines @@
 
   // The bubble needs to take up an integral number of pixels.
   // Generally -sizeWithAttributes: seems to overestimate rather than
   // underestimate, so floor() seems to work better.
   const CGFloat label_width =
       std::floor([label sizeWithAttributes:attributes_].width);
   return kBubblePadding + image_width + kIconLabelPadding + label_width;
 }
 
 NSRect BubbleDecoration::GetImageRectInFrame(NSRect frame) {
-  NSRect imageRect = NSInsetRect(frame, 0.0, kBubbleYInset);
+  NSRect imageRect = NSInsetRect(frame, 0.0, kTextYInset);
   if (image_) {
     // Center the image vertically.
     const NSSize imageSize = [image_ size];
     imageRect.origin.y +=
         std::floor((NSHeight(frame) - imageSize.height) / 2.0);
     imageRect.size = imageSize;
   }
   return imageRect;
 }
 
-CGFloat BubbleDecoration::GetWidthForSpace(CGFloat width) {
+CGFloat BubbleDecoration::GetWidthForSpace(CGFloat width, CGFloat text_width) {
   const CGFloat all_width = GetWidthForImageAndLabel(image_, label_);
   if (all_width <= width)
     return all_width;
 
   const CGFloat image_width = GetWidthForImageAndLabel(image_, nil);
   if (image_width <= width)
     return image_width;
 
   return kOmittedWidth;
 }
 
 void BubbleDecoration::DrawInFrame(NSRect frame, NSView* control_view) {
-  const NSRect decorationFrame = NSInsetRect(frame, 0.0, kBubbleYInset);
+  const NSRect decorationFrame = NSInsetRect(frame, 0.0, kTextYInset);
 
   // The inset is to put the border down the middle of the pixel.
   NSRect bubbleFrame = NSInsetRect(decorationFrame, 0.5, 0.5);
   bubbleFrame.origin.x -= kLeftSideOverdraw;
   bubbleFrame.size.width += kLeftSideOverdraw;
   NSBezierPath* path =
       [NSBezierPath bezierPathWithRoundedRect:bubbleFrame
                                       xRadius:kBubbleCornerRadius
                                       yRadius:kBubbleCornerRadius];
 
@@ skipping 48 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]);
 }