[Mac RTL] Fix the RTLness of the website settings bubble header.

chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

 // Copyright 2014 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/website_settings/website_settings_bubble_controller.h"
 
 #import <AppKit/AppKit.h>
 
 #include <cmath>
 
@@ skipping 328 matching lines @@
   securityDetailsField_ = [self addText:base::string16()
                                withSize:[NSFont smallSystemFontSize]
                                    bold:NO
                                  toView:securitySectionView
                                 atPoint:controlOrigin];
 
   // These will be created only if necessary.
   resetDecisionsField_ = nil;
   resetDecisionsButton_ = nil;
 
-  NSString* connectionHelpButtonText =
-      l10n_util::GetNSString(IDS_LEARN_MORE);
+  NSString* connectionHelpButtonText = l10n_util::GetNSString(IDS_LEARN_MORE);
   connectionHelpButton_ = [self addLinkButtonWithText:connectionHelpButtonText
-                                                toView:securitySectionView];
+                                               toView:securitySectionView];
   [connectionHelpButton_ setTarget:self];
   [connectionHelpButton_ setAction:@selector(openConnectionHelp:)];
 
+  if (base::i18n::IsRTL()) {
+    securitySummaryField_.alignment = NSRightTextAlignment;
+    securityDetailsField_.alignment = NSRightTextAlignment;

[lgrey, 2017/02/24 22:11:56]

Would an unconditional NSNaturalTextAlignment work here?

[Avi (use Gerrit), 2017/02/27 16:51:42]

No; when I try it out it keeps left aligning the text. Not sure why.

+  }
+
   return securitySectionView.get();
 }
 
 // Create and return a subview for the site settings and add it to the given
 // |superview|. |superview| retains the new view.
 - (NSView*)addSiteSettingsSectionToView:(NSView*)superview {
   base::scoped_nsobject<NSView> siteSettingsSectionView(
       [[FlippedView alloc] initWithFrame:[superview frame]]);
   [superview addSubview:siteSettingsSectionView];
 
@@ skipping 134 matching lines @@
   CGFloat yPos = 0;
 
   [self sizeTextFieldHeightToFit:securitySummaryField_];
   yPos = [self setYPositionOfView:securitySummaryField_
                                to:yPos + kSectionVerticalPadding];
 
   [self sizeTextFieldHeightToFit:securityDetailsField_];
   yPos = [self setYPositionOfView:securityDetailsField_
                                to:yPos + kSecurityParagraphSpacing];
 
-  [connectionHelpButton_
-      setFrameOrigin:NSMakePoint(
-                         kSectionHorizontalPadding - kLinkButtonXAdjustment,
-                         yPos)];
+  NSPoint helpOrigin =
+      NSMakePoint(kSectionHorizontalPadding - kLinkButtonXAdjustment, yPos);
+  if (base::i18n::IsRTL()) {
+    helpOrigin.x = NSWidth([contentView_ frame]) - helpOrigin.x -
+                   NSWidth(connectionHelpButton_.frame);
+  }
+  [connectionHelpButton_ setFrameOrigin:helpOrigin];
   yPos = NSMaxY([connectionHelpButton_ frame]);
 
   if (resetDecisionsButton_) {
     DCHECK(resetDecisionsField_);
     yPos = [self setYPositionOfView:resetDecisionsField_
                                  to:yPos + kSecurityParagraphSpacing];
     [resetDecisionsButton_
         setFrameOrigin:NSMakePoint(NSMinX([resetDecisionsButton_ frame]) -
                                        kLinkButtonXAdjustment,
                                    yPos)];
@@ skipping 685 matching lines @@
     const CookieInfoList& cookie_info_list) {
   [bubble_controller_ setCookieInfo:cookie_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     ChosenObjectInfoList chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:std::move(chosen_object_info_list)];
 }