[Mac] Reverse bookmark buttons and menus in RTL (take 2)

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.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/bookmarks/bookmark_bar_folder_controller.h"
 
 #include <stddef.h>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/bookmarks/bookmark_model_factory.h"
 #import "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 #import "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
+#import "chrome/browser/ui/cocoa/l10n_util.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 #import "components/bookmarks/managed/managed_bookmark_service.h"
 #include "ui/base/clipboard/clipboard_util_mac.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/resources/grit/ui_resources.h"
 
@@ skipping 235 matching lines @@
     parentButton_.reset([button retain]);
     selectedIndex_ = -1;
 
     profile_ = profile;
 
     // We want the button to remain bordered as part of the menu path.
     [button forceButtonBorderToStayOnAlways:YES];
 
     parentController_.reset([parentController retain]);
     if (!parentController_)
-      [self setSubFolderGrowthToRight:YES];
+      [self setSubFolderGrowthToRight:!cocoa_l10n_util::
+                                          ShouldDoExperimentalRTLLayout()];
     else
       [self setSubFolderGrowthToRight:[parentController
                                         subFolderGrowthToRight]];
     barController_ = barController;  // WEAK
     buttons_.reset([[NSMutableArray alloc] init]);
     folderTarget_.reset(
         [[BookmarkFolderTarget alloc] initWithController:self profile:profile]);
     [self configureWindow];
     hoverState_.reset([[BookmarkBarFolderHoverState alloc] init]);
   }
@@ skipping 232 matching lines @@
 // Compute and return the top left point of our window (screen
 // coordinates).  The top left is positioned in a manner similar to
 // cascading menus.  Windows may grow to either the right or left of
 // their parent (if a sub-folder) so we need to know |windowWidth|.
 - (NSPoint)windowTopLeftForWidth:(int)windowWidth height:(int)windowHeight {
   CGFloat kMinSqueezedMenuHeight = bookmarks::kBookmarkFolderButtonHeight * 2.0;
   NSPoint newWindowTopLeft;
   if (![parentController_ isKindOfClass:[self class]]) {
     // If we're not popping up from one of ourselves, we must be
     // popping up from the bookmark bar itself.  In this case, start
-    // BELOW the parent button.  Our left is the button left; our top
-    // is bottom of button's parent view.
-    NSPoint buttonBottomLeftInScreen = ui::ConvertPointFromWindowToScreen(
+    // BELOW the parent button. Our leading edge is the button leading
+    // edge; our top is bottom of button's parent view.
+    BOOL isRTL = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
+    NSPoint buttonAnchorPoint =
+        isRTL ? NSMakePoint(NSWidth([parentButton_ frame]), 0) : NSZeroPoint;
+    NSPoint buttonAnchorPointInScreen = ui::ConvertPointFromWindowToScreen(
         [parentButton_ window],
-        [parentButton_ convertPoint:NSZeroPoint toView:nil]);
-    NSPoint bookmarkBarBottomLeftInScreen = ui::ConvertPointFromWindowToScreen(
+        [parentButton_ convertPoint:buttonAnchorPoint toView:nil]);
+    NSPoint bookmarkBarAnchorPoint =
+        isRTL ? NSMakePoint(NSWidth([[parentButton_ superview] frame]), 0)
+              : NSZeroPoint;
+    NSPoint bookmarkBarAnchorPointInScreen = ui::ConvertPointFromWindowToScreen(
         [parentButton_ window],
-        [[parentButton_ superview] convertPoint:NSZeroPoint toView:nil]);
+        [[parentButton_ superview] convertPoint:bookmarkBarAnchorPoint
+                                         toView:nil]);
     newWindowTopLeft = NSMakePoint(
-        buttonBottomLeftInScreen.x,
-        bookmarkBarBottomLeftInScreen.y + bookmarks::kBookmarkBarMenuOffset);
+        isRTL ? buttonAnchorPointInScreen.x - windowWidth
+              : buttonAnchorPointInScreen.x,
+        bookmarkBarAnchorPointInScreen.y + bookmarks::kBookmarkBarMenuOffset);
     // Make sure the window is on-screen; if not, push left or right. It is
     // intentional that top level folders "push left" or "push right" slightly
     // different than subfolders.
     NSRect screenVisibleFrame = [[self menuScreen] visibleFrame];
     // Test if window goes off-screen on the right side.
     CGFloat spillOff =
         newWindowTopLeft.x + windowWidth - NSMaxX(screenVisibleFrame);
     if (spillOff > 0.0) {
       newWindowTopLeft.x = std::max(newWindowTopLeft.x - spillOff,
                                     NSMinX(screenVisibleFrame));
@@ skipping 918 matching lines @@
   // Closing the top level implicitly closes all children.
   [barController_ closeAllBookmarkFolders];
 }
 
 // Close our bookmark folder (a sub-controller) if we have one.
 - (void)closeBookmarkFolder:(id)sender {
   if (folderController_) {
     // Make this menu key, so key status doesn't go back to the browser
     // window when the submenu closes.
     [[self window] makeKeyWindow];
-    [self setSubFolderGrowthToRight:YES];
+    [self setSubFolderGrowthToRight:!cocoa_l10n_util::
+                                        ShouldDoExperimentalRTLLayout()];
     [[folderController_ window] close];
     folderController_ = nil;
   }
 }
 
 - (BookmarkModel*)bookmarkModel {
   return [barController_ bookmarkModel];
 }
 
 - (BOOL)draggingAllowed:(id<NSDraggingInfo>)info {
@@ skipping 610 matching lines @@
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 - (BookmarkButton*)buttonThatMouseIsIn {
   return buttonThatMouseIsIn_;
 }
 
 @end  // BookmarkBarFolderController