[Mac] Don't flip window controls in RTL for macOS < 10.12

chrome/browser/ui/cocoa/tabs/tab_strip_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/tabs/tab_strip_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <cmath>
 #include <limits>
@@ skipping 2252 matching lines @@
   if (modelIndex < 0)
     return nil;
   NSInteger index = [self indexFromModelIndex:modelIndex];
   if (index < 0 ||
       index >= (NSInteger)[tabContentsArray_ count])
     return nil;
   return [tabContentsArray_ objectAtIndex:index];
 }
 
 - (void)addCustomWindowControls {
-  BOOL isRTL = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
+  BOOL shouldFlipWindowControls =
+      cocoa_l10n_util::ShouldFlipWindowControlsInRTL();
   if (!customWindowControls_) {
     // Make the container view.
     CGFloat height = NSHeight([tabStripView_ frame]);
     CGFloat width = [self leadingIndentForControls];
-    CGFloat xOrigin = isRTL ? NSWidth([tabStripView_ frame]) - width : 0;
+    if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout() &&
+        !shouldFlipWindowControls)
+      // The trailing indent is correct in this case, since the controls should
+      // stay on the left.
+      width = [self trailingIndentForControls];
+    CGFloat xOrigin =
+        shouldFlipWindowControls ? NSWidth([tabStripView_ frame]) - width : 0;
     NSRect frame = NSMakeRect(xOrigin, 0, width, height);
     customWindowControls_.reset(
         [[CustomWindowControlsView alloc] initWithFrame:frame]);
     [customWindowControls_
-        setAutoresizingMask:isRTL ? NSViewMinXMargin | NSViewHeightSizable
-                                  : NSViewMaxXMargin | NSViewHeightSizable];
+        setAutoresizingMask:shouldFlipWindowControls
+                                ? NSViewMinXMargin | NSViewHeightSizable
+                                : NSViewMaxXMargin | NSViewHeightSizable];
 
     // Add the traffic light buttons. The horizontal layout was determined by
     // manual inspection on Yosemite.
     CGFloat closeButtonX = 11;
     CGFloat pinnedButtonX = 31;
     CGFloat zoomButtonX = 51;
-    if (isRTL)
+    if (shouldFlipWindowControls)
       std::swap(closeButtonX, zoomButtonX);
 
     NSUInteger styleMask = [[tabStripView_ window] styleMask];
     NSButton* closeButton = [NSWindow standardWindowButton:NSWindowCloseButton
                                               forStyleMask:styleMask];
 
     // Vertically center the buttons in the tab strip.
     CGFloat buttonY = floor((height - NSHeight([closeButton bounds])) / 2);
     [closeButton setFrameOrigin:NSMakePoint(closeButtonX, buttonY)];
     [customWindowControls_ addSubview:closeButton];
@@ skipping 12 matching lines @@
     [zoomButton setFrameOrigin:NSMakePoint(zoomButtonX, buttonY)];
 
     customWindowControlsTrackingArea_.reset([[CrTrackingArea alloc]
         initWithRect:[customWindowControls_ bounds]
              options:(NSTrackingMouseEnteredAndExited | NSTrackingActiveAlways)
                owner:self
             userInfo:nil]);
     [customWindowControls_
         addTrackingArea:customWindowControlsTrackingArea_.get()];
   }
-  if (isRTL &&
+  if (shouldFlipWindowControls &&
       NSMaxX([customWindowControls_ frame]) != NSMaxX([tabStripView_ frame])) {
     NSRect frame = [customWindowControls_ frame];
     frame.origin.x =
         NSMaxX([tabStripView_ frame]) - [self leadingIndentForControls];
     [customWindowControls_ setFrame:frame];
   }
   if (![permanentSubviews_ containsObject:customWindowControls_]) {
     [self addSubviewToPermanentList:customWindowControls_];
     [self regenerateSubviewList];
   }
@@ skipping 65 matching lines @@
   for (int i = 0; i < tabStripModel_->count(); i++) {
     [self updateIconsForContents:tabStripModel_->GetWebContentsAt(i) atIndex:i];
   }
 }
 
 - (void)setVisualEffectsDisabledForFullscreen:(BOOL)fullscreen {
   [tabStripView_ setVisualEffectsDisabledForFullscreen:fullscreen];
 }
 
 @end