Revert of [Mac] Flip toolbar in RTL

chrome/browser/ui/cocoa/toolbar/toolbar_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/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h"
 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
 #include "chrome/browser/ui/cocoa/drag_util.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/gradient_button_cell.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
-#import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button.h"
 #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h"
 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h"
 #import "chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h"
@@ skipping 89 matching lines @@
   return NSWidth([browser_actions_container_ frame]) + location_bar_flex;
 }
 
 }  // namespace
 
 @interface ToolbarController()
 @property(assign, nonatomic) Browser* browser;
 // Height of the location bar. Used for animating the toolbar in and out when
 // the location bar is displayed stand-alone for bookmark apps.
 + (CGFloat)locationBarHeight;
-// Return the amount of horizontal padding that the app menu should have on
-// each side.
-+ (CGFloat)appMenuPadding;
+// Return the amount of left padding that the app menu should have.
++ (CGFloat)appMenuLeftPadding;
 - (void)cleanUp;
 - (void)addAccessibilityDescriptions;
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(const std::string&)prefName;
 - (ToolbarView*)toolbarView;
 // Height of the toolbar in pixels when the bookmark bar is closed.
 - (CGFloat)baseToolbarHeight;
 - (void)toolbarFrameChanged;
 - (void)showLocationBarOnly;
-- (void)pinLocationBarBeforeBrowserActionsContainerAndAnimate:(BOOL)animate;
+- (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate;
 - (void)maintainMinimumLocationBarWidth;
 - (void)adjustBrowserActionsContainerForNewWindow:(NSNotification*)notification;
 - (void)browserActionsContainerDragged:(NSNotification*)notification;
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification;
 - (void)browserActionsContainerWillAnimate:(NSNotification*)notification;
 - (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate;
 - (void)updateAppMenuButtonSeverity:(AppMenuIconController::Severity)severity
                            iconType:(AppMenuIconController::IconType)iconType
                             animate:(BOOL)animate;
 @end
@@ skipping 59 matching lines @@
 }  // namespace ToolbarControllerInternal
 
 @implementation ToolbarController
 
 @synthesize browser = browser_;
 
 + (CGFloat)locationBarHeight {
   return kLocationBarHeight;
 }
 
-+ (CGFloat)appMenuPadding {
++ (CGFloat)appMenuLeftPadding {
   return kElementPadding;
 }
 
 + (CGFloat)materialDesignButtonInset {
   return kButtonInset;
 }
 
 - (id)initWithCommands:(CommandUpdater*)commands
                profile:(Profile*)profile
                browser:(Browser*)browser
@@ skipping 40 matching lines @@
 }
 
 - (void)viewDidLoad {
   // When linking and running on 10.10+, both -awakeFromNib and -viewDidLoad may
   // be called, don't initialize twice.
   if (locationBarView_) {
     DCHECK(base::mac::IsAtLeastOS10_10());
     return;
   }
 
-  BOOL isRTL = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
-  NSAutoresizingMaskOptions leadingButtonMask =
-      isRTL ? NSViewMinXMargin | NSViewMinYMargin
-            : NSViewMaxXMargin | NSViewMinYMargin;
-  NSAutoresizingMaskOptions trailingButtonMask =
-      isRTL ? NSViewMaxXMargin | NSViewMinYMargin
-            : NSViewMinXMargin | NSViewMinYMargin;
-
   // Make Material Design layout adjustments to the NIB items.
   ToolbarView* toolbarView = [self toolbarView];
   NSRect toolbarBounds = [toolbarView bounds];
   NSSize toolbarButtonSize = [ToolbarButton toolbarButtonSize];
 
   // Set the toolbar height.
   NSRect frame = [toolbarView frame];
   frame.size.height = [self baseToolbarHeight];
   [toolbarView setFrame:frame];
 
-  NSArray* leadingButtons =
-      @[ backButton_, forwardButton_, reloadButton_, homeButton_ ];
-  const CGFloat xStart = kElementPadding + kButtonInset;
-  const CGFloat xOffset = toolbarButtonSize.width + kButtonInset * 2;
-  const CGFloat yPosition =
+  NSRect backButtonFrame = [backButton_ frame];
+  backButtonFrame.origin.x = kElementPadding + kButtonInset;
+  backButtonFrame.origin.y =
       NSMaxY(toolbarBounds) - kElementPadding - toolbarButtonSize.height;
-  for (NSUInteger i = 0; i < [leadingButtons count]; i++) {
-    NSButton* button = leadingButtons[i];
-    NSRect buttonFrame = [button frame];
-    buttonFrame.size = toolbarButtonSize;
-    buttonFrame.origin.y = yPosition;
-    const CGFloat xPosition = xStart + i * xOffset;
-    buttonFrame.origin.x =
-        isRTL ? NSWidth(frame) - toolbarButtonSize.width - xPosition
-              : xPosition;
-    [button setFrame:buttonFrame];
-    [button setAutoresizingMask:leadingButtonMask];
-  }
+  backButtonFrame.size = toolbarButtonSize;
+  [backButton_ setFrame:backButtonFrame];
+
+  NSRect forwardButtonFrame = [forwardButton_ frame];
+  forwardButtonFrame.origin.x = NSMaxX(backButtonFrame) + 2 * kButtonInset;
+  forwardButtonFrame.origin.y = backButtonFrame.origin.y;
+  forwardButtonFrame.size = toolbarButtonSize;
+  [forwardButton_ setFrame:forwardButtonFrame];
+
+  NSRect reloadButtonFrame = [reloadButton_ frame];
+  reloadButtonFrame.origin.x = NSMaxX(forwardButtonFrame) + 2 * kButtonInset;
+  reloadButtonFrame.origin.y = forwardButtonFrame.origin.y;
+  reloadButtonFrame.size = toolbarButtonSize;
+  [reloadButton_ setFrame:reloadButtonFrame];
+
+  NSRect homeButtonFrame = [homeButton_ frame];
+  homeButtonFrame.origin.x = NSMaxX(reloadButtonFrame) + 2 * kButtonInset;
+  homeButtonFrame.origin.y = reloadButtonFrame.origin.y;
+  homeButtonFrame.size = toolbarButtonSize;
+  [homeButton_ setFrame:homeButtonFrame];
 
   // Replace the app button from the nib with an AppToolbarButton instance for
   // Material Design.
   AppToolbarButton* newMenuButton =
       [[[AppToolbarButton alloc] initWithFrame:[appMenuButton_ frame]]
           autorelease];
   [newMenuButton setAutoresizingMask:[appMenuButton_ autoresizingMask]];
   [[appMenuButton_ superview] addSubview:newMenuButton];
   [appMenuButton_ removeFromSuperview];
   appMenuButton_ = newMenuButton;
 
   // Adjust the menu button's position.
   NSRect menuButtonFrame = [appMenuButton_ frame];
-  if (isRTL) {
-    menuButtonFrame.origin.x = [ToolbarController appMenuPadding];
-  } else {
-    CGFloat menuButtonFrameMaxX =
-        NSMaxX(toolbarBounds) - [ToolbarController appMenuPadding];
-    menuButtonFrame.origin.x =
-        menuButtonFrameMaxX - kButtonInset - toolbarButtonSize.width;
-  }
-  menuButtonFrame.origin.y = yPosition;
+  CGFloat menuButtonFrameMaxX =
+      NSMaxX(toolbarBounds) - [ToolbarController appMenuLeftPadding];
+  menuButtonFrame.origin.x =
+      menuButtonFrameMaxX - kButtonInset - toolbarButtonSize.width;
+  menuButtonFrame.origin.y = homeButtonFrame.origin.y;
   menuButtonFrame.size = toolbarButtonSize;
   [appMenuButton_ setFrame:menuButtonFrame];
-  [appMenuButton_ setAutoresizingMask:trailingButtonMask];
 
   // Adjust the size and location on the location bar to take up the
   // space between the reload and menu buttons.
   NSRect locationBarFrame = [locationBar_ frame];
-  locationBarFrame.origin.x = isRTL
-                                  ? NSMaxX(menuButtonFrame) + kButtonInset
-                                  : NSMaxX([homeButton_ frame]) + kButtonInset;
-  if (![homeButton_ isHidden] && !isRTL) {
-    // Ensure proper spacing between the home button and location bar
+  locationBarFrame.origin.x = NSMaxX(homeButtonFrame) + kButtonInset;
+  if (![homeButton_ isHidden]) {
+    // Ensure proper spacing between the home button and the location bar.
     locationBarFrame.origin.x += kElementPadding;
   }
   locationBarFrame.origin.y =
       NSMaxY(toolbarBounds) - kLocationBarPadding - kLocationBarHeight;
-  CGFloat rightEdge = 0;
-  if (isRTL) {
-    rightEdge = NSMinX([homeButton_ frame]) - kButtonInset;
-    if (![homeButton_ isHidden])
-      rightEdge -= kElementPadding;
-  } else {
-    rightEdge = NSMinX(menuButtonFrame);
-  }
-  locationBarFrame.size.width = rightEdge - NSMinX(locationBarFrame);
-
+  locationBarFrame.size.width =
+      menuButtonFrame.origin.x -
+          locationBarFrame.origin.x;
   locationBarFrame.size.height = kLocationBarHeight;
   [locationBar_ setFrame:locationBarFrame];
 
   // Correctly position the extension buttons' container view.
   NSRect containerFrame = [browserActionsContainerView_ frame];
   containerFrame.size.width += kButtonInset;
   containerFrame.origin.y = locationBarFrame.origin.y + kContainerYOffset;
   containerFrame.size.height = toolbarButtonSize.height;
-  if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout())
-    containerFrame.origin.x = NSMinX(locationBarFrame);
   [browserActionsContainerView_ setFrame:containerFrame];
-  [browserActionsContainerView_ setAutoresizingMask:trailingButtonMask];
 
   notificationBridge_.reset(
       new ToolbarControllerInternal::NotificationBridge(self));
   notificationBridge_->UpdateSeverity();
 
   [appMenuButton_ setOpenMenuOnClick:YES];
 
   [backButton_ setOpenMenuOnRightClick:YES];
   [forwardButton_ setOpenMenuOnRightClick:YES];
 
@@ skipping 26 matching lines @@
   // and then add them to the toolbar based on those prefs.
   PrefService* prefs = profile_->GetPrefs();
   showHomeButton_.Init(
       prefs::kShowHomeButton, prefs,
       base::Bind(
           &ToolbarControllerInternal::NotificationBridge::OnPreferenceChanged,
           base::Unretained(notificationBridge_.get())));
   [self showOptionalHomeButton];
   [self installAppMenu];
 
-  [self pinLocationBarBeforeBrowserActionsContainerAndAnimate:NO];
+  [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
 
   // Create the controllers for the back/forward menus.
   backMenuController_.reset([[BackForwardMenuController alloc]
           initWithBrowser:browser_
                 modelType:BACK_FORWARD_MENU_TYPE_BACK
                    button:backButton_]);
   forwardMenuController_.reset([[BackForwardMenuController alloc]
           initWithBrowser:browser_
                 modelType:BACK_FORWARD_MENU_TYPE_FORWARD
                    button:forwardButton_]);
@@ skipping 247 matching lines @@
     [self showLocationBarOnly];
 }
 
 // (Private) Returns the backdrop to the toolbar as a ToolbarView.
 - (ToolbarView*)toolbarView{
   return base::mac::ObjCCastStrict<ToolbarView>([self view]);
 }
 
 - (id)customFieldEditorForObject:(id)obj {
   if (obj == locationBar_) {
-    // Lazily construct Field editor, Cocoa UI code always runs on the
+    // Lazilly construct Field editor, Cocoa UI code always runs on the
     // same thread, so there shoudn't be a race condition here.
     if (autocompleteTextFieldEditor_.get() == nil) {
       autocompleteTextFieldEditor_.reset(
           [[AutocompleteTextFieldEditor alloc] init]);
     }
 
     // This needs to be called every time, otherwise notifications
     // aren't sent correctly.
     DCHECK(autocompleteTextFieldEditor_.get());
     [autocompleteTextFieldEditor_.get() setFieldEditor:YES];
     return autocompleteTextFieldEditor_.get();
   }
   return nil;
 }
 
-// Returns an array of views, ordered leading to trailing.
+// Returns an array of views in the order of the outlets above.
 - (NSArray*)toolbarViews {
-  return @[
-    backButton_, forwardButton_, reloadButton_, homeButton_, locationBar_,
-    browserActionsContainerView_, appMenuButton_
-  ];
+  return [NSArray arrayWithObjects:backButton_, forwardButton_, reloadButton_,
+                                   homeButton_, appMenuButton_, locationBar_,
+                                   browserActionsContainerView_, nil];
+}
+
+// Moves |rect| to the right by |delta|, keeping the right side fixed by
+// shrinking the width to compensate. Passing a negative value for |deltaX|
+// moves to the left and increases the width.
+- (NSRect)adjustRect:(NSRect)rect byAmount:(CGFloat)deltaX {
+  NSRect frame = NSOffsetRect(rect, deltaX, 0);
+  frame.size.width -= deltaX;
+  return frame;
 }
 
 // Show or hide the home button based on the pref.
 - (void)showOptionalHomeButton {
   // Ignore this message if only showing the URL bar.
   if (!hasToolbar_)
     return;
   BOOL hide = showHomeButton_.GetValue() ? NO : YES;
   if (hide == [homeButton_ isHidden])
     return;  // Nothing to do, view state matches pref state.
 
   // Always shift the text field by the width of the home button minus one pixel
   // since the frame edges of each button are right on top of each other. When
   // hiding the button, reverse the direction of the movement (to the left).
   CGFloat moveX = [homeButton_ frame].size.width;
   // Ensure proper spacing between the home button and the location bar.
   moveX += kElementPadding;
   if (hide)
     moveX *= -1;  // Reverse the direction of the move.
-  CGRect locationBarFrame = [locationBar_ frame];
-  locationBarFrame.size.width -= moveX;
-  if (!cocoa_l10n_util::ShouldDoExperimentalRTLLayout())
-    locationBarFrame.origin.x += moveX;
-  [locationBar_ setFrame:locationBarFrame];
+
+  [locationBar_ setFrame:[self adjustRect:[locationBar_ frame]
+                                 byAmount:moveX]];
   [homeButton_ setHidden:hide];
 }
 
 // Install the app menu buttons. Calling this repeatedly is inexpensive so it
 // can be done every time the buttons are shown.
 - (void)installAppMenu {
   if (appMenuController_.get())
     return;
 
   appMenuController_.reset(
@@ skipping 40 matching lines @@
            selector:@selector(browserActionsContainerWillAnimate:)
                name:kBrowserActionsContainerWillAnimate
              object:browserActionsContainerView_];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(adjustBrowserActionsContainerForNewWindow:)
                name:NSWindowDidBecomeKeyNotification
              object:[[self view] window]];
   }
   if (![browserActionsContainerView_ isHidden])
-    [self pinLocationBarBeforeBrowserActionsContainerAndAnimate:NO];
+    [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
 }
 
 - (void)updateVisibility:(BOOL)visible withAnimation:(BOOL)animate {
   CGFloat newHeight = visible ? [ToolbarController locationBarHeight] : 0;
 
   // Perform the animation, which will cause the BrowserWindowController to
   // resize this view in the browser layout as required.
   if (animate) {
     [[self toolbarView] animateToNewHeight:newHeight
                                   duration:kToolBarAnimationDuration];
   } else {
     [[self toolbarView] setHeight:newHeight];
   }
 }
 
 - (void)adjustBrowserActionsContainerForNewWindow:
     (NSNotification*)notification {
   [self toolbarFrameChanged];
   [[NSNotificationCenter defaultCenter]
       removeObserver:self
                 name:NSWindowDidBecomeKeyNotification
               object:[[self view] window]];
 }
 
 - (void)browserActionsContainerDragged:(NSNotification*)notification {
-  [self pinLocationBarBeforeBrowserActionsContainerAndAnimate:NO];
+  [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
 }
 
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification {
-  [self pinLocationBarBeforeBrowserActionsContainerAndAnimate:NO];
+  [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
 }
 
 - (void)browserActionsContainerWillAnimate:(NSNotification*)notification {
-  [self pinLocationBarBeforeBrowserActionsContainerAndAnimate:YES];
+  [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:YES];
 }
 
-- (void)pinLocationBarBeforeBrowserActionsContainerAndAnimate:(BOOL)animate {
-  CGFloat delta = 0.0;
-  if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) {
-    CGFloat leftEdge = NSMinX([locationBar_ frame]);
-    if ([browserActionsContainerView_ isHidden]) {
-      delta = leftEdge - NSMaxX([appMenuButton_ frame]) +
-              [ToolbarController appMenuPadding] + kButtonInset;
-    } else {
-      delta = leftEdge - NSMaxX([browserActionsContainerView_ frame]) +
-              kButtonInset;
-    }
+- (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate {
+  CGFloat locationBarXPos = NSMaxX([locationBar_ frame]);
+  CGFloat leftDistance = 0.0;
+
+  if ([browserActionsContainerView_ isHidden]) {
+    CGFloat edgeXPos = [appMenuButton_ frame].origin.x;
+    leftDistance = edgeXPos - locationBarXPos -
+        [ToolbarController appMenuLeftPadding] - kButtonInset;
   } else {
-    CGFloat rightEdge = NSMaxX([locationBar_ frame]);
-    if ([browserActionsContainerView_ isHidden]) {
-      delta = NSMinX([appMenuButton_ frame]) -
-              [ToolbarController appMenuPadding] - kButtonInset - rightEdge;
-    } else {
-      delta = NSMinX([browserActionsContainerView_ frame]) - kButtonInset -
-              rightEdge;
-    }
+    leftDistance = NSMinX([browserActionsContainerView_ animationEndFrame]) -
+        locationBarXPos;
+    // Equalize the distance between the location bar and the first extension
+    // button, and the distance between the location bar and home/reload button.
+    leftDistance -= kButtonInset;
   }
-
-  if (delta != 0.0)
-    [self adjustLocationSizeBy:delta animate:animate];
+  if (leftDistance != 0.0)
+    [self adjustLocationSizeBy:leftDistance animate:animate];
   else
     [locationBar_ stopAnimation];
 }
 
 - (void)maintainMinimumLocationBarWidth {
   CGFloat locationBarWidth = NSWidth([locationBar_ frame]);
   locationBarAtMinSize_ = locationBarWidth <= kMinimumLocationBarWidth;
   if (locationBarAtMinSize_) {
     CGFloat dX = kMinimumLocationBarWidth - locationBarWidth;
     [self adjustLocationSizeBy:dX animate:NO];
   }
 }
 
 - (void)toolbarFrameChanged {
   // Do nothing if the frame changes but no Browser Action Controller is
   // present.
   if (!browserActionsController_.get())
     return;
 
   if ([browserActionsContainerView_ isAnimating]) {
     // If the browser actions container is animating, we need to stop it first,
     // because the frame it's animating for could be incorrect with the new
     // bounds (if, for instance, the bookmark bar was added).
     // This will advance to the end of the animation, so we also need to adjust
     // it afterwards.
     [browserActionsContainerView_ stopAnimation];
     NSRect containerFrame = [browserActionsContainerView_ frame];
     containerFrame.origin.y = [locationBar_ frame].origin.y + kContainerYOffset;
     [browserActionsContainerView_ setFrame:containerFrame];
-    [self pinLocationBarBeforeBrowserActionsContainerAndAnimate:NO];
+    [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
   }
 
   [self maintainMinimumLocationBarWidth];
 
   if (locationBarAtMinSize_) {
     // Once the grippy is pinned, leave it until it is explicity un-pinned.
     [browserActionsContainerView_ setGrippyPinned:YES];
     NSRect containerFrame = [browserActionsContainerView_ frame];
     // Determine how much the container needs to move in case it's overlapping
     // with the location bar.
-    if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) {
-      CGFloat dX = NSMaxX(containerFrame) - NSMinX([locationBar_ frame]);
-      containerFrame.size.width -= dX;
-    } else {
-      CGFloat dX = NSMaxX([locationBar_ frame]) - containerFrame.origin.x;
-      containerFrame = NSOffsetRect(containerFrame, dX, 0);
-    }
+    CGFloat dX = NSMaxX([locationBar_ frame]) - containerFrame.origin.x;
+    containerFrame = NSOffsetRect(containerFrame, dX, 0);
+    containerFrame.size.width -= dX;
     [browserActionsContainerView_ setFrame:containerFrame];
   } else if (!locationBarAtMinSize_ &&
       [browserActionsContainerView_ grippyPinned]) {
     // Expand out the container until it hits the saved size, then unpin the
     // grippy.
     // Add 0.1 pixel so that it doesn't hit the minimum width codepath above.
     CGFloat dX = NSWidth([locationBar_ frame]) -
         (kMinimumLocationBarWidth + 0.1);
     NSRect containerFrame = [browserActionsContainerView_ frame];
-    if (!cocoa_l10n_util::ShouldDoExperimentalRTLLayout())
-      containerFrame = NSOffsetRect(containerFrame, -dX, 0);
+    containerFrame = NSOffsetRect(containerFrame, -dX, 0);
     containerFrame.size.width += dX;
     CGFloat savedContainerWidth =
         [browserActionsController_ preferredSize].width();
     if (NSWidth(containerFrame) >= savedContainerWidth) {
-      if (!cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) {
-        containerFrame = NSOffsetRect(
-            containerFrame, NSWidth(containerFrame) - savedContainerWidth, 0);
-      }
+      containerFrame = NSOffsetRect(containerFrame,
+          NSWidth(containerFrame) - savedContainerWidth, 0);
       containerFrame.size.width = savedContainerWidth;
       [browserActionsContainerView_ setGrippyPinned:NO];
     }
     [browserActionsContainerView_ setFrame:containerFrame];
-    [self pinLocationBarBeforeBrowserActionsContainerAndAnimate:NO];
+    [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
   }
 }
 
 // Hide the back, forward, reload, home, and app menu buttons of the toolbar.
 // This allows the location bar to occupy the entire width. There is no way to
 // undo this operation, and once it is called, no other programmatic changes
 // to the toolbar or location bar width should be made. This message is
 // invalid if the toolbar is shown or the location bar is hidden.
 - (void)showLocationBarOnly {
   // -showLocationBarOnly is only ever called once, shortly after
   // initialization, so the regular buttons should all be visible.
   DCHECK(!hasToolbar_ && hasLocationBar_);
   DCHECK(![backButton_ isHidden]);
 
   // Ensure the location bar fills the toolbar.
   NSRect toolbarFrame = [[self view] frame];
   toolbarFrame.size.height = [ToolbarController locationBarHeight];
   [[self view] setFrame:toolbarFrame];
 
   [locationBar_ setFrame:NSMakeRect(0, 0, NSWidth([[self view] frame]),
                                     [ToolbarController locationBarHeight])];
 
   [backButton_ setHidden:YES];
   [forwardButton_ setHidden:YES];
   [reloadButton_ setHidden:YES];
   [appMenuButton_ setHidden:YES];
   [homeButton_ setHidden:YES];
-  [browserActionsContainerView_ setHidden:YES];
 }
 
 - (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate {
   // Ensure that the location bar is in its proper place.
   NSRect locationFrame = [locationBar_ frame];
   locationFrame.size.width += dX;
-  if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout())
-    locationFrame.origin.x -= dX;
 
   [locationBar_ stopAnimation];
+
   if (animate)
     [locationBar_ animateToFrame:locationFrame];
   else
     [locationBar_ setFrame:locationFrame];
 }
 
 - (NSPoint)bookmarkBubblePoint {
   if (locationBarView_->IsStarEnabled())
     return locationBarView_->GetBubblePointForDecoration(
         locationBarView_->star_decoration());
@@ skipping 115 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end