[Mac] Mirror content settings bubble in RTL.

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.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/content_settings/content_setting_bubble_cocoa.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 81 matching lines @@
   [cell setControlSize:controlSize];
 }
 
 // Returns an autoreleased NSTextField that is configured to look like a Label
 // looks in Interface Builder.
 NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) {
   NSTextField* label = [[NSTextField alloc] initWithFrame:frame];
   [label setStringValue:text];
   [label setSelectable:NO];
   [label setBezeled:NO];
+  [label setAlignment:NSNaturalTextAlignment];
   return [label autorelease];
 }
 
 // Sets the title for the popup button.
 void SetTitleForPopUpButton(NSPopUpButton* button, NSString* title) {
   base::scoped_nsobject<NSMenuItem> titleItem([[NSMenuItem alloc] init]);
   [titleItem setTitle:title];
   [[button cell] setUsesItemFromMenu:NO];
   [[button cell] setMenuItem:titleItem.get()];
 }
@@ skipping 260 matching lines @@
 
   // Layout title post-localization.
   CGFloat deltaY = [GTMUILocalizerAndLayoutTweaker
       sizeToFitFixedWidthTextField:titleLabel_];
   NSRect windowFrame = [[self window] frame];
   windowFrame.size.height += deltaY;
   [[self window] setFrame:windowFrame display:NO];
   NSRect titleFrame = [titleLabel_ frame];
   titleFrame.origin.y -= deltaY;
   [titleLabel_ setFrame:titleFrame];
+  [titleLabel_ setAlignment:NSNaturalTextAlignment];
 }
 
 - (void)initializeMessage {
   if (!messageLabel_)
     return;
 
   NSString* label = base::SysUTF16ToNSString(
       contentSettingBubbleModel_->bubble_content().message);
   [messageLabel_ setStringValue:label];
 
   CGFloat deltaY = [GTMUILocalizerAndLayoutTweaker
       sizeToFitFixedWidthTextField:messageLabel_];
   NSRect windowFrame = [[self window] frame];
   windowFrame.size.height += deltaY;
   [[self window] setFrame:windowFrame display:NO];
   NSRect messageFrame = [messageLabel_ frame];
   messageFrame.origin.y -= deltaY;
   [messageLabel_ setFrame:messageFrame];
+  [messageLabel_ setAlignment:NSNaturalTextAlignment];
 }
 
 - (void)initializeRadioGroup {
   // NOTE! Tags in the xib files must match the order of the radio buttons
   // passed in the radio_group and be 1-based, not 0-based.
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       contentSettingBubbleModel_->bubble_content();
   const ContentSettingBubbleModel::RadioGroup& radio_group =
       bubble_content.radio_group;
 
@@ skipping 22 matching lines @@
   }
 
   // Layout radio group labels post-localization.
   [GTMUILocalizerAndLayoutTweaker
       wrapRadioGroupForWidth:allowBlockRadioGroup_];
   CGFloat radioDeltaY = [GTMUILocalizerAndLayoutTweaker
       sizeToFitView:allowBlockRadioGroup_].height;
   NSRect windowFrame = [[self window] frame];
   windowFrame.size.height += radioDeltaY;
   [[self window] setFrame:windowFrame display:NO];
+
+  // NSMatrix-based radio buttons don't get automatically flipped for
+  // RTL. Setting the user interface layout direction explicitly
+  // doesn't affect rendering, so set image position and text alignment
+  // manually.
+  if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout())
+    for (NSButtonCell* cell in [allowBlockRadioGroup_ cells]) {
+      [cell setAlignment:NSNaturalTextAlignment];
+      [cell setImagePosition:cocoa_l10n_util::LeadingCellImagePosition()];
+      // Why not?
+      [cell setUserInterfaceLayoutDirection:
+                NSUserInterfaceLayoutDirectionRightToLeft];
+    }
 }
 
 - (NSButton*)hyperlinkButtonWithFrame:(NSRect)frame
                                 title:(NSString*)title
                                  icon:(NSImage*)icon
                        referenceFrame:(NSRect)referenceFrame {
   base::scoped_nsobject<HyperlinkButtonCell> cell(
       [[HyperlinkButtonCell alloc] initTextCell:title]);
   [cell.get() setAlignment:NSNaturalTextAlignment];
   if (icon) {
@@ skipping 460 matching lines @@
         [manageButton_ removeFromSuperview];
 
       NSRect frame = [[self window] frame];
       frame.size.height -= delta;
       [[self window] setFrame:frame display:NO];
     }
   }
 
   if (contentSettingBubbleModel_->AsMediaStreamBubbleModel())
     [self initializeMediaMenus];
+  // RTL-ize NIBS:

[Avi (use Gerrit), 2017/06/09 17:41:05]

blank line above this comment to separate it from the previous code

[lgrey, 2017/06/09 17:59:13]

Done.

+  if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) {
+    cocoa_l10n_util::FlipAllSubviewsIfNecessary([self bubble]);
+    // Some NIBs have the manage/done buttons outside of the bubble.
+    cocoa_l10n_util::FlipAllSubviewsIfNecessary([[self bubble] superview]);
+    cocoa_l10n_util::FlipAllSubviewsIfNecessary(contentsContainer_);
+    // These buttons are inside |GTMWidthBasedTweaker|s, so fix margins.
+    cocoa_l10n_util::FlipAllSubviewsIfNecessary([infoButton_ superview]);
+    cocoa_l10n_util::FlipAllSubviewsIfNecessary([doneButton_ superview]);
+    cocoa_l10n_util::FlipAllSubviewsIfNecessary([manageButton_ superview]);

[Avi (use Gerrit), 2017/06/09 17:41:05]

for both of these line comments (941, 944), since they group with the lines
below them, space before them to make that clear.

[lgrey, 2017/06/09 17:59:13]

Done.

+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Actual application logic
 
 - (IBAction)allowBlockToggled:(id)sender {
   NSButtonCell *selectedCell = [sender selectedCell];
   contentSettingBubbleModel_->OnRadioClicked([selectedCell tag] - 1);
 }
 
@@ skipping 50 matching lines @@
 
 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus {
   return &mediaMenus_;
 }
 
 - (LocationBarDecoration*)decorationForBubble {
   return decoration_;
 }
 
 @end  // ContentSettingBubbleController