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

chrome/browser/ui/cocoa/l10n_util.mm

 // Copyright (c) 2010 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/l10n_util.h"
 
 #include "base/i18n/rtl.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 78 matching lines @@
 
 bool ShouldDoExperimentalRTLLayout() {
   return base::i18n::IsRTL() &&
          base::FeatureList::IsEnabled(kExperimentalMacRTL);
 }
 
 bool ShouldFlipWindowControlsInRTL() {
   return ShouldDoExperimentalRTLLayout() && base::mac::IsAtLeastOS10_12();
 }
 
+// TODO(lgrey): Remove these when all builds are on 10.12 SDK.
+#if defined(MAC_OS_X_VERSION_10_12) && \
+    (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12)
+#warning LeadingCellImagePosition/TrailingCellImagePosition \
+  should be removed since the deployment target is >= 10.12
+#endif
+
+#if !defined(MAC_OS_X_VERSION_10_12) || \
+    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
+NSCellImagePosition LeadingCellImagePosition() {
+  return ShouldDoExperimentalRTLLayout() ? NSImageRight : NSImageLeft;
+}
+NSCellImagePosition TrailingCellImagePosition() {
+  return ShouldDoExperimentalRTLLayout() ? NSImageLeft : NSImageRight;
+}
+#else
+NSCellImagePosition LeadingCellImagePosition() {
+  return NSImageLeading;
+}
+NSCellImagePosition TrailingCellImagePosition() {
+  return NSImageTrailing;
+}
+#endif  // MAC_OS_X_VERSION_10_12
+
 // Adapted from Apple's RTL docs (goo.gl/cBaFnT)
 NSImage* FlippedImage(NSImage* image) {
   const NSSize size = [image size];
   NSImage* flipped_image = [[[NSImage alloc] initWithSize:size] autorelease];
 
   [flipped_image lockFocus];
   [[NSGraphicsContext currentContext]
       setImageInterpolation:NSImageInterpolationHigh];
 
   NSAffineTransform* transform = [NSAffineTransform transform];
   [transform translateXBy:size.width yBy:0];
   [transform scaleXBy:-1 yBy:1];
   [transform concat];
 
   [image drawAtPoint:NSZeroPoint
             fromRect:NSMakeRect(0, 0, size.width, size.height)
            operation:NSCompositeSourceOver
             fraction:1.0];
 
   [flipped_image unlockFocus];
 
   return flipped_image;
 }
 
 }  // namespace cocoa_l10n_util