| Index: chrome/browser/ui/cocoa/browser_window_layout.mm
 | 
| diff --git a/chrome/browser/ui/cocoa/browser_window_layout.mm b/chrome/browser/ui/cocoa/browser_window_layout.mm
 | 
| index 61ea945871ce2dcedcc63f1a8bc385dc96b50e4f..95819323bd8cf1055aa254077f5146262b118a74 100644
 | 
| --- a/chrome/browser/ui/cocoa/browser_window_layout.mm
 | 
| +++ b/chrome/browser/ui/cocoa/browser_window_layout.mm
 | 
| @@ -265,8 +265,11 @@ const CGFloat kLocationBarRightOffset = 35;
 | 
|    layout.trailingIndent = width - maxX;
 | 
|  
 | 
|    if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) {
 | 
| -    layout.avatarFrame.origin.x =
 | 
| -        width - parameters_.avatarSize.width - layout.avatarFrame.origin.x;
 | 
| +    if (cocoa_l10n_util::ShouldFlipWindowControlsInRTL())
 | 
| +      layout.avatarFrame.origin.x =
 | 
| +          width - parameters_.avatarSize.width - layout.avatarFrame.origin.x;
 | 
| +    else
 | 
| +      std::swap(layout.leadingIndent, layout.trailingIndent);
 | 
|    }
 | 
|  
 | 
|    output_.tabStripLayout = layout;
 | 
| 
 |