Revert of [Mac] Flip toolbar in RTL

chrome/browser/ui/cocoa/extensions/browser_actions_container_view.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/extensions/browser_actions_container_view.h"
 
 #include <algorithm>
 #include <utility>
 
-#import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "ui/base/cocoa/appkit_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion_mac.h"
 
 NSString* const kBrowserActionGrippyDragStartedNotification =
     @"BrowserActionGrippyDragStartedNotification";
 NSString* const kBrowserActionGrippyDraggingNotification =
     @"BrowserActionGrippyDraggingNotification";
 NSString* const kBrowserActionGrippyDragFinishedNotification =
     @"BrowserActionGrippyDragFinishedNotification";
@@ skipping 31 matching lines @@
 @synthesize maxDesiredWidth = maxDesiredWidth_;
 @synthesize userIsResizing = userIsResizing_;
 @synthesize delegate = delegate_;
 
 #pragma mark -
 #pragma mark Overridden Class Functions
 
 - (id)initWithFrame:(NSRect)frameRect {
   if ((self = [super initWithFrame:frameRect])) {
     grippyRect_ = NSMakeRect(0.0, 0.0, kGrippyWidth, NSHeight([self bounds]));
-    if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout())
-      grippyRect_.origin.x = NSWidth(frameRect) - NSWidth(grippyRect_);
-
     canDragLeft_ = YES;
     canDragRight_ = YES;
     resizable_ = YES;
 
     resizeAnimation_.reset([[NSViewAnimation alloc] init]);
     [resizeAnimation_ setDuration:kAnimationDuration];
     [resizeAnimation_ setAnimationBlockingMode:NSAnimationNonblocking];
     [resizeAnimation_ setDelegate:self];
 
     [self setHidden:YES];
@@ skipping 84 matching lines @@
 
 - (void)setIsOverflow:(BOOL)isOverflow {
   if (isOverflow_ != isOverflow) {
     isOverflow_ = isOverflow;
     resizable_ = !isOverflow_;
     [self setNeedsDisplay:YES];
   }
 }
 
 - (void)resetCursorRects {
-  if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout())
-    grippyRect_.origin.x = NSWidth([self frame]) - NSWidth(grippyRect_);
   [self addCursorRect:grippyRect_ cursor:[self appropriateCursorForGrippy]];
 }
 
 - (BOOL)acceptsFirstResponder {
   // The overflow container needs to receive key events to handle in-item
   // navigation. The top-level container should not become first responder,
   // allowing focus travel to proceed to the first action.
   return isOverflow_;
 }
 
@@ skipping 32 matching lines @@
 
 - (void)mouseDragged:(NSEvent*)theEvent {
   if (!userIsResizing_)
     return;
 
   NSPoint location = [self convertPoint:[theEvent locationInWindow]
                                fromView:nil];
   NSRect containerFrame = [self frame];
   CGFloat dX = [theEvent deltaX];
   CGFloat withDelta = location.x - dX;
-  BOOL isRTL = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
+  canDragRight_ = (withDelta >= initialDragPoint_.x) &&
+      (NSWidth(containerFrame) > kMinimumContainerWidth);
+  CGFloat maxAllowedWidth = [self maxAllowedWidth];
+  containerFrame.size.width =
+      std::max(NSWidth(containerFrame) - dX, kMinimumContainerWidth);
+  canDragLeft_ = withDelta <= initialDragPoint_.x &&
+      NSWidth(containerFrame) < maxDesiredWidth_ &&
+      NSWidth(containerFrame) < maxAllowedWidth;
 
-  CGFloat maxAllowedWidth = [self maxAllowedWidth];
-
-  const CGFloat maxWidth = std::min(maxAllowedWidth, maxDesiredWidth_);
-  CGFloat newWidth = NSWidth(containerFrame) + (isRTL ? dX : -dX);
-  newWidth = std::min(std::max(newWidth, kMinimumContainerWidth), maxWidth);
-
-  BOOL canGrow = NSWidth(containerFrame) < maxWidth;
-  BOOL canShrink = NSWidth(containerFrame) > kMinimumContainerWidth;
-
-  canDragLeft_ =
-      withDelta <= initialDragPoint_.x && (isRTL ? canShrink : canGrow);
-  canDragRight_ =
-      (withDelta >= initialDragPoint_.x) && (isRTL ? canGrow : canShrink);
-  if ((dX < 0.0 && !canDragLeft_) || (dX > 0.0 && !canDragRight_) ||
-      fabs(dX) < FLT_EPSILON)
+  if ((dX < 0.0 && !canDragLeft_) || (dX > 0.0 && !canDragRight_))
     return;
 
-  grippyPinned_ = newWidth >= maxAllowedWidth;
-  if (!isRTL)
-    containerFrame.origin.x += dX;
-  containerFrame.size.width = newWidth;
+  if (NSWidth(containerFrame) <= kMinimumContainerWidth)
+    return;
+
+  grippyPinned_ = NSWidth(containerFrame) >= maxAllowedWidth;
+  containerFrame.origin.x += dX;
 
   [self setFrame:containerFrame];
   [self setNeedsDisplay:YES];
 
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kBrowserActionGrippyDraggingNotification
                     object:self];
 }
 
 - (void)animationDidEnd:(NSAnimation*)animation {
@@ skipping 20 matching lines @@
 
 - (ViewID)viewID {
   return VIEW_ID_BROWSER_ACTION_TOOLBAR;
 }
 
 #pragma mark -
 #pragma mark Public Methods
 
 - (void)resizeToWidth:(CGFloat)width animate:(BOOL)animate {
   width = std::max(width, kMinimumContainerWidth);
-  NSRect newFrame = [self frame];
+  NSRect frame = [self frame];
 
   CGFloat maxAllowedWidth = [self maxAllowedWidth];
   width = std::min(maxAllowedWidth, width);
 
-  if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) {
-    newFrame.size.width = width;
-  } else {
-    CGFloat dX = NSWidth(newFrame) - width;
-    newFrame.size.width = width;
-    newFrame.origin.x += dX;
-  }
+  CGFloat dX = frame.size.width - width;
+  frame.size.width = width;
+  NSRect newFrame = NSOffsetRect(frame, dX, 0);
 
   grippyPinned_ = width == maxAllowedWidth;
 
   [self stopAnimation];
 
   if (animate) {
     NSDictionary* animationDictionary = @{
       NSViewAnimationTargetKey : self,
       NSViewAnimationStartFrameKey : [NSValue valueWithRect:[self frame]],
       NSViewAnimationEndFrameKey : [NSValue valueWithRect:newFrame]
@@ skipping 46 matching lines @@
     retVal = [NSCursor resizeLeftRightCursor];
   }
   return retVal;
 }
 
 - (CGFloat)maxAllowedWidth {
   return delegate_ ? delegate_->GetMaxAllowedWidth() : CGFLOAT_MAX;
 }
 
 @end