Alternate NTP: Add search token to omnibox

chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

Index: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
index b248205bd9e6454db9fb708f85c1b9c238b94c5f..02656a3f15fa8c572ea3eafacf3d05edeb9318aa 100644
--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
@@ -296,8 +296,10 @@ void ContentSettingDecoration::SetToolTip(NSString* tooltip) {
 
 // Override to handle the case where there is text to display during the
 // animation. The width is based on the animator's progress.
-CGFloat ContentSettingDecoration::GetWidthForSpace(CGFloat width) {
-  CGFloat preferred_width = ImageDecoration::GetWidthForSpace(width);
+CGFloat ContentSettingDecoration::GetWidthForSpace(CGFloat width,
+                                                   CGFloat text_width) {
+  CGFloat preferred_width =
+      ImageDecoration::GetWidthForSpace(width, text_width);
   if (animation_.get()) {
     AnimationState state = [animation_ animationState];
     if (state != kNoAnimation) {
@@ -364,7 +366,7 @@ void ContentSettingDecoration::DrawInFrame(NSRect frame, NSView* control_view) {
     // rect.
     NSRect remainder = frame;
     remainder.origin.x = NSMaxX(icon_rect);
-    NSInsetRect(remainder, kTextMarginPadding, kTextMarginPadding);
+    NSInsetRect(remainder, kTextMarginPadding, kTextYInset);
     // .get() needed to fix compiler warning (confusion with NSImageRep).
     [animated_text_.get() drawAtPoint:remainder.origin];
   } else {