[Mac] Make bubble arrow location/position RTL-aware

Instead of left and right, callers now specify leading and trailing. For
LTR, leading = left, and trailing = right, and in RTL they are reversed.

BUG=678257

Review-Url: https://codereview.chromium.org/2717603003
Cr-Commit-Position: refs/heads/master@{#453232}

chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm

@@ -494,7 +494,7 @@ void CardUnmaskPromptViewBridge::PerformClose() {
 
   // Add "?" icon with tooltip.
   storageTooltip_.reset([[AutofillTooltipController alloc]
-      initWithArrowLocation:info_bubble::kTopRight]);
+      initWithArrowLocation:info_bubble::kTopTrailing]);
   [storageTooltip_ setImage:ui::ResourceBundle::GetSharedInstance()
                                 .GetNativeImageNamed(IDR_AUTOFILL_TOOLTIP_ICON)
                                 .ToNSImage()];

chrome/browser/ui/cocoa/base_bubble_controller.mm

@@ -114,7 +114,7 @@
                                                                   self));
   }
 
-  [bubble_ setArrowLocation:info_bubble::kTopRight];
+  [bubble_ setArrowLocation:info_bubble::kTopTrailing];
 }
 
 - (void)dealloc {
@@ -411,11 +411,13 @@
                                   info_bubble::kBubbleArrowWidth / 2.0, 0);
       offsets = [[parentWindow_ contentView] convertSize:offsets toView:nil];
       switch ([bubble_ arrowLocation]) {
-        case info_bubble::kTopRight:
-          origin.x -= NSWidth([window frame]) - offsets.width;
+        case info_bubble::kTopTrailing:
+          origin.x -=
+              isRTL ? offsets.width : NSWidth([window frame]) - offsets.width;
           break;
-        case info_bubble::kTopLeft:
-          origin.x -= offsets.width;
+        case info_bubble::kTopLeading:
+          origin.x -=
+              isRTL ? NSWidth([window frame]) - offsets.width : offsets.width;
           break;
         case info_bubble::kNoArrow:
         // FALLTHROUGH.
@@ -431,7 +433,7 @@
       // edge aligns with the anchor. If the arrow is to the left then there's
       // nothing to do because the left edge is already aligned with the left
       // edge of the anchor.
-      if ([bubble_ arrowLocation] == info_bubble::kTopRight) {
+      if ([bubble_ arrowLocation] == info_bubble::kTopTrailing) {
         origin.x -= NSWidth([window frame]);
       }
       break;

chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm

@@ -165,7 +165,7 @@ class BaseBubbleControllerTest : public CocoaTest {
 // Test that kAlignEdgeToAnchorEdge and a left bubble arrow correctly aligns the
 // left edge of the buble to the anchor point.
 TEST_F(BaseBubbleControllerTest, LeftAlign) {
-  [[controller_ bubble] setArrowLocation:info_bubble::kTopLeft];
+  [[controller_ bubble] setArrowLocation:info_bubble::kTopLeading];
   [[controller_ bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge];
   [controller_ showWindow:nil];
 
@@ -181,7 +181,7 @@ TEST_F(BaseBubbleControllerTest, LeftAlign) {
 // Test that kAlignEdgeToAnchorEdge and a right bubble arrow correctly aligns
 // the right edge of the buble to the anchor point.
 TEST_F(BaseBubbleControllerTest, RightAlign) {
-  [[controller_ bubble] setArrowLocation:info_bubble::kTopRight];
+  [[controller_ bubble] setArrowLocation:info_bubble::kTopTrailing];
   [[controller_ bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge];
   [controller_ showWindow:nil];
 
@@ -197,7 +197,7 @@ TEST_F(BaseBubbleControllerTest, RightAlign) {
 // Test that kAlignArrowToAnchor and a left bubble arrow correctly aligns
 // the bubble arrow to the anchor point.
 TEST_F(BaseBubbleControllerTest, AnchorAlignLeftArrow) {
-  [[controller_ bubble] setArrowLocation:info_bubble::kTopLeft];
+  [[controller_ bubble] setArrowLocation:info_bubble::kTopLeading];
   [[controller_ bubble] setAlignment:info_bubble::kAlignArrowToAnchor];
   [controller_ showWindow:nil];
 
@@ -214,7 +214,7 @@ TEST_F(BaseBubbleControllerTest, AnchorAlignLeftArrow) {
 // Test that kAlignArrowToAnchor and a right bubble arrow correctly aligns
 // the bubble arrow to the anchor point.
 TEST_F(BaseBubbleControllerTest, AnchorAlignRightArrow) {
-  [[controller_ bubble] setArrowLocation:info_bubble::kTopRight];
+  [[controller_ bubble] setArrowLocation:info_bubble::kTopTrailing];
   [[controller_ bubble] setAlignment:info_bubble::kAlignArrowToAnchor];
   [controller_ showWindow:nil];
 
@@ -248,7 +248,7 @@ TEST_F(BaseBubbleControllerTest, AnchorAlignCenterArrow) {
 // ensures offscreen initialization is done using correct screen metrics.
 TEST_F(BaseBubbleControllerTest, PositionedBeforeShow) {
   // Verify default alignment settings, used when initialized in SetUp().
-  EXPECT_EQ(info_bubble::kTopRight, [[controller_ bubble] arrowLocation]);
+  EXPECT_EQ(info_bubble::kTopTrailing, [[controller_ bubble] arrowLocation]);
   EXPECT_EQ(info_bubble::kAlignArrowToAnchor, [[controller_ bubble] alignment]);
 
   // Verify the default frame (positioned relative to the test_window() origin).

chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm

@@ -144,7 +144,7 @@ using bookmarks::BookmarkNode;
       [BrowserWindowController browserWindowControllerForWindow:parentWindow];
 
   InfoBubbleView* bubble = self.bubble;
-  [bubble setArrowLocation:info_bubble::kTopRight];
+  [bubble setArrowLocation:info_bubble::kTopTrailing];
 
   // Insure decent positioning even in the absence of a browser controller,
   // which will occur for some unit tests.

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

@@ -791,7 +791,7 @@ const ContentTypeToNibPath kNibPaths[] = {
   ContentSettingSimpleBubbleModel* simple_bubble =
       contentSettingBubbleModel_->AsSimpleBubbleModel();
 
-  [[self bubble] setArrowLocation:info_bubble::kTopRight];
+  [[self bubble] setArrowLocation:info_bubble::kTopTrailing];
 
   // Adapt window size to bottom buttons. Do this before all other layouting.
   if (simple_bubble && !simple_bubble->bubble_content().manage_text.empty())

chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.mm

@@ -77,7 +77,7 @@ void ExtensionActionPlatformDelegateCocoa::ShowPopup(
   [ExtensionPopupController host:std::move(host)
                        inBrowser:controller_->browser()
                       anchoredAt:GetPopupPoint()
-                   arrowLocation:info_bubble::kTopRight
+                   arrowLocation:info_bubble::kTopTrailing
                          devMode:devMode];
 }
 

chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

@@ -285,9 +285,9 @@ std::unique_ptr<BubbleUi> ExtensionInstalledBubble::BuildBubbleUi() {
   if (installedBubble_ &&
       installedBubble_->anchor_position() ==
           ExtensionInstalledBubble::ANCHOR_OMNIBOX) {
-    [self.bubble setArrowLocation:info_bubble::kTopLeft];
+    [self.bubble setArrowLocation:info_bubble::kTopLeading];
   } else {
-    [self.bubble setArrowLocation:info_bubble::kTopRight];
+    [self.bubble setArrowLocation:info_bubble::kTopTrailing];
   }
 
   // Set appropriate icon, resizing if necessary.

chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm

@@ -87,7 +87,7 @@ CGFloat kMinWidth = 320.0;
 
     ui::NativeTheme* nativeTheme = ui::NativeTheme::GetInstanceForNativeUi();
     [[self bubble] setAlignment:info_bubble::kAlignArrowToAnchor];
-    [[self bubble] setArrowLocation:info_bubble::kTopRight];
+    [[self bubble] setArrowLocation:info_bubble::kTopTrailing];
     [[self bubble] setBackgroundColor:
         skia::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(
             ui::NativeTheme::kColorId_DialogBackground))];

chrome/browser/ui/cocoa/info_bubble_view.h

@@ -25,9 +25,9 @@ enum CornerFlags {
 };
 
 enum BubbleArrowLocation {
-  kTopLeft,
+  kTopLeading,
   kTopCenter,
-  kTopRight,
+  kTopTrailing,
   kNoArrow,
 };
 

chrome/browser/ui/cocoa/info_bubble_view.mm

@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
+#import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h"
 
 @implementation InfoBubbleView
@@ -17,7 +18,7 @@
 
 - (id)initWithFrame:(NSRect)frameRect {
   if ((self = [super initWithFrame:frameRect])) {
-    arrowLocation_ = info_bubble::kTopLeft;
+    arrowLocation_ = info_bubble::kTopLeading;
     alignment_ = info_bubble::kAlignArrowToAnchor;
     cornerFlags_ = info_bubble::kRoundedAllCorners;
     backgroundColor_.reset([[NSColor whiteColor] retain]);
@@ -64,14 +65,17 @@
                         bottomRightCornerRadius:bottomRadius];
 
   // Add the bubble arrow.
+  BOOL isRTL = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
   CGFloat dX = 0;
+  CGFloat leftOffset = info_bubble::kBubbleArrowXOffset;
+  CGFloat rightOffset = NSWidth(bounds) - info_bubble::kBubbleArrowXOffset -
+                        info_bubble::kBubbleArrowWidth;
   switch (arrowLocation_) {
-    case info_bubble::kTopLeft:
-      dX = info_bubble::kBubbleArrowXOffset;
+    case info_bubble::kTopLeading:
+      dX = isRTL ? rightOffset : leftOffset;
       break;
-    case info_bubble::kTopRight:
-      dX = NSWidth(bounds) - info_bubble::kBubbleArrowXOffset -
-          info_bubble::kBubbleArrowWidth;
+    case info_bubble::kTopTrailing:
+      dX = isRTL ? leftOffset : rightOffset;
       break;
     case info_bubble::kTopCenter:
       dX = NSMidX(bounds) - info_bubble::kBubbleArrowWidth / 2.0;
@@ -103,12 +107,15 @@
   CGFloat tipXOffset =
       info_bubble::kBubbleArrowXOffset + info_bubble::kBubbleArrowWidth / 2.0;
   CGFloat xOffset = 0.0;
+  BOOL isRTL = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
+  CGFloat leftOffset = NSMaxX(bounds) - tipXOffset;
+  CGFloat rightOffset = NSMinX(bounds) + tipXOffset;
   switch(arrowLocation_) {
-    case info_bubble::kTopRight:
-      xOffset = NSMaxX(bounds) - tipXOffset;
+    case info_bubble::kTopTrailing:
+      xOffset = isRTL ? rightOffset : leftOffset;
       break;
-    case info_bubble::kTopLeft:
-      xOffset = NSMinX(bounds) + tipXOffset;
+    case info_bubble::kTopLeading:
+      xOffset = isRTL ? leftOffset : rightOffset;
       break;
     case info_bubble::kTopCenter:
       xOffset = NSMidX(bounds);

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

@@ -118,7 +118,7 @@
         browserWindowControllerForWindow:[self parentWindow]];
     anchorPoint = [controller locationBarBridge]->GetBubblePointForDecoration(
         [self decorationForBubble]);
-    arrow = info_bubble::kTopRight;
+    arrow = info_bubble::kTopTrailing;
   } else {
     // Center the bubble if there's no location bar.
     NSRect contentFrame = [[[self parentWindow] contentView] frame];

chrome/browser/ui/cocoa/validation_message_bubble_cocoa.mm

@@ -47,7 +47,7 @@ anchoredAt:(NSPoint)anchorPoint
   if ((self = [super initWithWindow:window.get()
                        parentWindow:parentWindow
                          anchoredAt:anchorPoint])) {
-    [[self bubble] setArrowLocation:info_bubble::kTopLeft];
+    [[self bubble] setArrowLocation:info_bubble::kTopLeading];
     self.shouldOpenAsKeyWindow = NO;
 
     NSView* contentView = [ValidationMessageBubbleController

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

@@ -246,7 +246,8 @@ std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {
 }
 
 - (info_bubble::BubbleArrowLocation)getExpectedArrowLocation {
-  return [self hasLocationBar] ? info_bubble::kTopLeft : info_bubble::kNoArrow;
+  return [self hasLocationBar] ? info_bubble::kTopLeading
+                               : info_bubble::kNoArrow;
 }
 
 - (NSWindow*)getExpectedParentWindow {

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

@@ -479,7 +479,7 @@ const NSInteger kFullscreenLeftOffset = 40;
 }
 
 - (info_bubble::BubbleArrowLocation)getExpectedArrowLocation {
-  return info_bubble::kTopLeft;
+  return info_bubble::kTopLeading;
 }
 
 - (NSWindow*)getExpectedParentWindow {

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

@@ -213,7 +213,7 @@ bool IsInternalURL(const GURL& url) {
   if ((self = [super initWithWindow:window.get()
                        parentWindow:parentWindow
                          anchoredAt:NSZeroPoint])) {
-    [[self bubble] setArrowLocation:info_bubble::kTopLeft];
+    [[self bubble] setArrowLocation:info_bubble::kTopLeading];
 
     // Create the container view that uses flipped coordinates.
     NSRect contentFrame = NSMakeRect(0, 0, [self defaultWindowWidth], 300);