Fix RTL mode for the account picker on Mac.

chrome/browser/ui/cocoa/passwords/credential_item_button.mm

 // Copyright 2016 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/passwords/credential_item_button.h"
 
+#include "base/i18n/rtl.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/passwords/passwords_bubble_utils.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 #include "chrome/grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
@@ skipping 26 matching lines @@
   return self;
 }
 
 - (NSRect)drawTitle:(NSAttributedString*)title
           withFrame:(NSRect)frame
              inView:(NSView*)controlView {
   // The title frame origin isn't aware of the left margin spacing added
   // in -drawImage, so it must be added when drawing the title.
   NSRect marginRect;
   NSDivideRect(frame, &marginRect, &frame, marginSpacing_, NSMinXEdge);
-  NSDivideRect(frame, &marginRect, &frame, imageTitleSpacing_, NSMinXEdge);
+  NSDivideRect(frame, &marginRect, &frame, imageTitleSpacing_,
+               base::i18n::IsRTL() ? NSMaxXEdge : NSMinXEdge);
   NSDivideRect(frame, &marginRect, &frame, marginSpacing_, NSMaxXEdge);
 
   return [super drawTitle:title withFrame:frame inView:controlView];
 }
 
 - (void)drawImage:(NSImage*)image
         withFrame:(NSRect)frame
            inView:(NSView*)controlView {
-  frame.origin.x = marginSpacing_;
+  if (base::i18n::IsRTL())
+    frame.origin.x -= marginSpacing_;
+  else
+    frame.origin.x += marginSpacing_;
   gfx::ScopedNSGraphicsContextSaveGState scopedGState;
   NSBezierPath* path = [NSBezierPath bezierPathWithOvalInRect:frame];
   [path addClip];
   [super drawImage:image withFrame:frame inView:controlView];
 }
 
 - (NSSize)cellSize {
   NSSize buttonSize = [super cellSize];
   buttonSize.width += imageTitleSpacing_;
   buttonSize.width += 2 * marginSpacing_;
@@ skipping 36 matching lines @@
     [cell setLineBreakMode:NSLineBreakByTruncatingTail];
     [cell setHighlightsBy:NSChangeGrayCellMask];
     [self setCell:cell.get()];
 
     [self setBordered:NO];
     [self setFont:ResourceBundle::GetSharedInstance()
                       .GetFontList(ResourceBundle::SmallFont)
                       .GetPrimaryFont()
                       .GetNativeFont()];
     [self setButtonType:NSMomentaryLightButton];
-    [self setImagePosition:NSImageLeft];
-    [self setAlignment:NSLeftTextAlignment];
+    [self setImagePosition:base::i18n::IsRTL() ? NSImageRight : NSImageLeft];
   }
   return self;
 }
 
 + (NSImage*)defaultAvatar {
   return gfx::NSImageFromImageSkia(ScaleImageForAccountAvatar(
       *ResourceBundle::GetSharedInstance()
            .GetImageNamed(IDR_PROFILE_AVATAR_PLACEHOLDER_LARGE)
            .ToImageSkia()));
 }
 
 - (void)setHoverState:(HoverState)state {
   [super setHoverState:state];
   bool isHighlighted = ([self hoverState] != kHoverStateNone);
 
   NSColor* backgroundColor = isHighlighted ? hoverColor_ : backgroundColor_;
   [[self cell] setBackgroundColor:backgroundColor];
 }
 
 - (BOOL)canBecomeKeyView {
   return YES;
 }
 
 @end