[Mac] Flip toolbar button images in RTL

chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm

 // Copyright (c) 2011 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_button_cocoa.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
@@ skipping 189 matching lines @@
 }
 
 - (void)drawFocusRingMask {
   // Match the hover image's bezel.
   [[NSBezierPath bezierPathWithRoundedRect:NSInsetRect([self bounds], 2, 2)
                                    xRadius:2
                                    yRadius:2] fill];
 }
 
 - (const gfx::VectorIcon*)vectorIcon {
-  BOOL isRTL = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
   switch ([self viewID]) {
     case VIEW_ID_BACK_BUTTON:
-      return isRTL ? &ui::kForwardArrowIcon : &ui::kBackArrowIcon;
+      return &ui::kBackArrowIcon;
     case VIEW_ID_FORWARD_BUTTON:
-      return isRTL ? &ui::kBackArrowIcon : &ui::kForwardArrowIcon;
+      return &ui::kForwardArrowIcon;
     case VIEW_ID_HOME_BUTTON:
       return &kNavigateHomeIcon;
     case VIEW_ID_APP_MENU:
       return &kBrowserToolsIcon;
     default:
       break;
   }
 
   return nullptr;
 }
@@ skipping 79 matching lines @@
     CGFloat normalAlpha = isDarkTheme ? 0xCC : 0xFF;
     const SkColor normalColor = SkColorSetA(vectorIconColor, normalAlpha);
     const SkColor disabledColor = SkColorSetA(vectorIconColor, 0x33);
 
     // Create the normal and disabled state icons. These icons are always the
     // same shape but use a different color.
     if (icon == &kBrowserToolsIcon) {
       normalIcon = [self browserToolsIconForFillColor:normalColor];
       disabledIcon = [self browserToolsIconForFillColor:disabledColor];
     } else {
+      BOOL isRTL = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
       normalIcon = NSImageFromImageSkia(
           gfx::CreateVectorIcon(*icon,
                                 kMDButtonIconSize.width,
                                 normalColor));
-
+      if (isRTL)
+        normalIcon = cocoa_l10n_util::FlippedImage(normalIcon);
       // The home button has no icon for its disabled state.
       if (icon != &kNavigateReloadIcon) {
         disabledIcon = NSImageFromImageSkia(
             gfx::CreateVectorIcon(*icon,
                                   kMDButtonIconSize.width,
                                   disabledColor));
+        if (isRTL)
+          disabledIcon = cocoa_l10n_util::FlippedImage(disabledIcon);
       }
     }
   }
 
   ImageButtonCell* theCell = base::mac::ObjCCast<ImageButtonCell>([self cell]);
   // Set the image for the default state, which is just the icon.
   [theCell setImage:normalIcon forButtonState:image_button_cell::kDefaultState];
 
   // Determine the appropriate image background style for the hover and pressed
   // states.
@@ skipping 42 matching lines @@
 
 - (void)windowDidChangeTheme {
   // Update the hover and pressed image backgrounds to match the current theme.
   [self resetButtonStateImages];
 }
 
 - (void)windowDidChangeActive {
 }
 
 @end