[Mac] Fix keyword hint spacing in RTL

chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.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.
 
 #include <stddef.h>
 
 #include <cmath>
 
 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"
 
@@ skipping 14 matching lines @@
 const CGFloat kHintImageYInset = 4.0;
 
 // Extra padding right and left of the image.
 const CGFloat kHintImagePadding = 1.0;
 
 // Maxmimum of the available space to allow the hint to take over.
 // Should leave enough so that the user has space to edit things.
 const CGFloat kHintAvailableRatio = 2.0 / 3.0;
 
 // Extra padding at the right of the decoration.
-const CGFloat kHintRightPadding = 5.0;
+const CGFloat kHintTrailingPadding = 5.0;
 
 // Helper to convert |s| to an |NSString|, trimming whitespace at
 // ends.
 NSString* TrimAndConvert(const base::string16& s) {
   base::string16 output;
   base::TrimWhitespace(s, base::TRIM_ALL, &output);
   return base::SysUTF16ToNSString(output);
 }
 
 }  // namespace
@@ skipping 54 matching lines @@
     return kOmittedWidth;
 
   // Show the full hint if it won't take up too much space.  The image
   // needs to be placed at a pixel boundary, round the text widths so
   // that any partially-drawn pixels don't look too close (or too
   // far).
   CGFloat full_width =
       std::floor(GetLabelSize(hint_prefix_, attributes_).width + 0.5) +
       kHintImagePadding + image_width + kHintImagePadding +
       std::floor(GetLabelSize(hint_suffix_, attributes_).width + 0.5) +
-      kHintRightPadding;
+      kHintTrailingPadding;
   if (full_width <= width * kHintAvailableRatio)
     return full_width;
 
   return image_width;
 }
 
 void KeywordHintDecoration::DrawInFrame(NSRect frame, NSView* control_view) {
   NSImage* image = GetHintImage();
   const CGFloat image_width = image ? [image size].width : 0.0;
 
   const bool draw_full = NSWidth(frame) > image_width;
 
   BOOL is_rtl = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
   NSString* left_string = is_rtl ? hint_suffix_ : hint_prefix_;
   NSString* right_string = is_rtl ? hint_prefix_ : hint_suffix_;
+  if (is_rtl) {
+    frame.origin.x += kHintTrailingPadding;
+    frame.size.width -= kHintTrailingPadding;
+  }
 
   if (draw_full) {
     NSRect left_rect = frame;
     const CGFloat left_width = GetLabelSize(left_string, attributes_).width;
     left_rect.size.width = left_width;
     DrawLabel(left_string, attributes_, left_rect);
     // The image should be drawn at a pixel boundary, round the prefix
     // so that partial pixels aren't oddly close (or distant).
     frame.origin.x += std::floor(left_width + 0.5) + kHintImagePadding;
     frame.size.width -= std::floor(left_width + 0.5) + kHintImagePadding;
@@ skipping 16 matching lines @@
 
     // Draw the text kHintImagePadding away from [tab] icon so that
     // equal amount of space is maintained on either side of the icon.
     // This also ensures that suffix text is at the same distance
     // from [tab] icon in different web pages.
     right_rect.origin.x += kHintImagePadding;
     DCHECK_GE(NSWidth(right_rect), right_width);
     DrawLabel(right_string, attributes_, right_rect);
   }
 }