[Mac] (More) RTL support for tab strip

chrome/browser/ui/cocoa/browser_window_layout.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/browser_window_layout.h"
 
 #include <math.h>
 #include <string.h>
 
 #include "base/logging.h"
@@ skipping 192 matching lines @@
 
   // In Yosemite, there is no longer an exit fullscreen button in the top-right
   // corner of the OSX Menu Bar. Instead, a Cocoa application's toolbar is
   // expected to have traffic lights. Chrome doesn't use an NSToolbar, so it
   // needs to manually add the traffic lights to the tab strip.
   layout.addCustomWindowControls =
       parameters_.inAnyFullscreen && parameters_.isOSYosemiteOrLater;
 
   // Set left indentation based on fullscreen mode status.
   if (!parameters_.inAnyFullscreen || layout.addCustomWindowControls)
-    layout.leftIndent = [TabStripController defaultLeftIndentForControls];
+    layout.leadingIndent = [TabStripController defaultLeadingIndentForControls];
 
   // Lay out the icognito/avatar badge because calculating the indentation on
   // the right depends on it.
   if (parameters_.shouldShowAvatar) {
     CGFloat badgeXOffset = -kAvatarRightOffset;
     CGFloat badgeYOffset = 0;
     CGFloat buttonHeight = parameters_.avatarSize.height;
 
     if (parameters_.shouldUseNewAvatar) {
       // The fullscreen icon (if present) is displayed to the right of the
@@ skipping 26 matching lines @@
   // fullscreen button (old style), or to its left (new style).
   // The right indentation is calculated to prevent the tab strip from
   // overlapping these buttons.
   CGFloat maxX = width;
   if (!NSIsEmptyRect(parameters_.fullscreenButtonFrame)) {
     maxX = NSMinX(parameters_.fullscreenButtonFrame);
   }
   if (parameters_.shouldShowAvatar) {
     maxX = std::min(maxX, NSMinX(layout.avatarFrame));
   }
-  layout.rightIndent = width - maxX;
+  layout.trailingIndent = width - maxX;
 
   if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) {
-    std::swap(layout.leftIndent, layout.rightIndent);
     layout.avatarFrame.origin.x =
         width - parameters_.avatarSize.width - layout.avatarFrame.origin.x;
   }
 
   output_.tabStripLayout = layout;
 }
 
 - (void)computeContentViewLayout {
   chrome::LayoutParameters parameters = parameters_;
   CGFloat maxY = maxY_;
@@ skipping 128 matching lines @@
 
 @end
 
 @implementation BrowserWindowLayout (ExposedForTesting)
 
 - (void)setOSYosemiteOrLater:(BOOL)osYosemiteOrLater {
   parameters_.isOSYosemiteOrLater = osYosemiteOrLater;
 }
 
 @end