Give request-to-act badges a grey background, and increase spacing to make it fit.

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

 // Copyright (c) 2012 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/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_logging.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
+#import "chrome/common/extensions/extension_switch_utils.h"
 #import "third_party/mozilla/NSPasteboard+Utils.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 = 5.0;
 
 // How far to inset the right-hand decorations from the field's bounds.
 // TODO(shess): Why is this different from |kLeftDecorationXOffset|?
 // |kDecorationOuterXOffset|?
 const CGFloat kRightDecorationXOffset = 5.0;
+const CGFloat kScriptBadgeRightDecorationXOffset = 9.0;
+
+inline CGFloat RightDecorationXOffset() {

[Scott Hess - ex-Googler, 2012/09/12 22:54:08]

Shouldn't need inline.  It's static to this file, so the compiler can figure it
out.  Or not.  But don't second-guess it.

Also, pull the constants into the function so that nobody accidentally uses them
directly.

[Jeffrey Yasskin, 2012/09/14 22:13:45]

Done.

+  return extensions::switch_utils::AreScriptBadgesEnabled() ?
+      kScriptBadgeRightDecorationXOffset : kRightDecorationXOffset;
+}
 
 // The amount of padding on either side reserved for drawing
 // decorations.  [Views has |kItemPadding| == 3.]
 const CGFloat kDecorationHorizontalPad = 3.0;
+const CGFloat kScriptBadgeDecorationHorizontalPad = 9.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
 // overall frame to do layout in, |remaining_frame| will get the
 // left-over space.  |all_decorations| is the set of decorations to
 // lay out, |decorations| will be set to the decorations which are
 // visible and which fit, in the same order as |all_decorations|,
 // while |decoration_frames| will be the corresponding frames.
 // |x_edge| describes the edge to layout the decorations against
 // (|NSMinXEdge| or |NSMaxXEdge|).  |initial_padding| is the padding
-// from the edge of |cell_frame| (|kDecorationHorizontalPad| is used
+// from the edge of |cell_frame| (|+decorationHorizontalPad| is used
 // between decorations).
 void CalculatePositionsHelper(
     NSRect frame,
     const std::vector<LocationBarDecoration*>& all_decorations,
     NSRectEdge x_edge,
     CGFloat initial_padding,
     std::vector<LocationBarDecoration*>* decorations,
     std::vector<NSRect>* decoration_frames,
     NSRect* remaining_frame) {
   DCHECK(x_edge == NSMinXEdge || x_edge == NSMaxXEdge);
@@ skipping 22 matching lines @@
         // Peel off the desired width, leaving the remainder in
         // |frame|.
         NSDivideRect(available, &decoration_frame, &frame,
                      used_width, x_edge);
 
         decorations->push_back(all_decorations[i]);
         decoration_frames->push_back(decoration_frame);
         DCHECK_EQ(decorations->size(), decoration_frames->size());
 
         // Adjust padding for between decorations.
-        padding = kDecorationHorizontalPad;
+        padding = [AutocompleteTextFieldCell decorationHorizontalPad];
       }
     }
   }
 
   DCHECK_EQ(decorations->size(), decoration_frames->size());
   *remaining_frame = frame;
 }
 
 // Helper function for calculating placement of decorations w/in the
 // cell.  |frame| is the cell's boundary rectangle, |remaining_frame|
@@ skipping 19 matching lines @@
   CalculatePositionsHelper(frame, left_decorations,
                            NSMinXEdge, kLeftDecorationXOffset,
                            decorations, decoration_frames, &frame);
   DCHECK_EQ(decorations->size(), decoration_frames->size());
 
   // Capture the number of visible left-hand decorations.
   const size_t left_count = decorations->size();
 
   // Layout |right_decorations| against the RHS.
   CalculatePositionsHelper(frame, right_decorations,
-                           NSMaxXEdge, kRightDecorationXOffset,
+                           NSMaxXEdge, RightDecorationXOffset(),
                            decorations, decoration_frames, &frame);
   DCHECK_EQ(decorations->size(), decoration_frames->size());
 
   // Reverse the right-hand decorations so that overall everything is
   // sorted left to right.
   std::reverse(decorations->begin() + left_count, decorations->end());
   std::reverse(decoration_frames->begin() + left_count,
                decoration_frames->end());
 
   *remaining_frame = frame;
+  if (extensions::switch_utils::AreScriptBadgesEnabled()) {
+    // Keep the padding distance between the right-most decoration and the edit
+    // box, so that any decoration background isn't overwritten by the edit
+    // box's background.
+    NSRect dummy;
+    NSDivideRect(frame, &dummy, remaining_frame,
+                 [AutocompleteTextFieldCell decorationHorizontalPad],
+                 NSMaxXEdge);
+  }
   return left_count;
 }
 
 }  // namespace
 
 @implementation AutocompleteTextFieldCell
 
++ (CGFloat)decorationHorizontalPad {
+  return extensions::switch_utils::AreScriptBadgesEnabled() ?
+      kScriptBadgeDecorationHorizontalPad : kDecorationHorizontalPad;
+}
+
 - (CGFloat)baselineAdjust {
   return kBaselineAdjust;
 }
 
 - (CGFloat)cornerRadius {
   return kCornerRadius;
 }
 
 - (BOOL)shouldDrawBezel {
   return YES;
@@ skipping 76 matching lines @@
   // Determine the left-most extent for the i-beam cursor.
   CGFloat minX = NSMinX(textFrame);
   for (size_t index = left_count; index--; ) {
     if (decorations[index]->AcceptsMousePress())
       break;
 
     // If at leftmost decoration, expand to edge of cell.
     if (!index) {
       minX = NSMinX(cellFrame);
     } else {
-      minX = NSMinX(decorationFrames[index]) - kDecorationHorizontalPad;
+      minX = NSMinX(decorationFrames[index]) -
+          [AutocompleteTextFieldCell decorationHorizontalPad];
     }
   }
 
   // Determine the right-most extent for the i-beam cursor.
   CGFloat maxX = NSMaxX(textFrame);
   for (size_t index = left_count; index < decorations.size(); ++index) {
     if (decorations[index]->AcceptsMousePress())
       break;
 
     // If at rightmost decoration, expand to edge of cell.
     if (index == decorations.size() - 1) {
       maxX = NSMaxX(cellFrame);
     } else {
-      maxX = NSMaxX(decorationFrames[index]) + kDecorationHorizontalPad;
+      maxX = NSMaxX(decorationFrames[index]) +
+          [AutocompleteTextFieldCell decorationHorizontalPad];
     }
   }
 
   // I-beam cursor covers left-most to right-most.
   return NSMakeRect(minX, NSMinY(textFrame), maxX - minX, NSHeight(textFrame));
 }
 
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   std::vector<LocationBarDecoration*> decorations;
   std::vector<NSRect> decorationFrames;
@@ skipping 290 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