[Mac] Fix bugs in resizing the browser actions area next to the omnibox.

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 "chrome/browser/ui/layout_constants.h"

[Robert Sesek, 2017/01/13 22:53:59]

I can't find any other uses of layout_constants.h in Cocoa code, so I'm not sure
it's the right thing to be using here. But it looks like it may have been in the
past? (E.g., https://codereview.chromium.org/1770573002).

+shrike for his opinion

[Sidney San Martín, 2017/01/13 23:03:29]

I may have a better option, hang tight.

 #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";
 NSString* const kBrowserActionsContainerWillAnimate =
     @"BrowserActionsContainerWillAnimate";
 NSString* const kBrowserActionsContainerAnimationEnded =
     @"BrowserActionsContainerAnimationEnded";
 NSString* const kTranslationWithDelta =
     @"TranslationWithDelta";
 NSString* const kBrowserActionsContainerReceivedKeyEvent =
     @"BrowserActionsContainerReceivedKeyEvent";
 NSString* const kBrowserActionsContainerKeyEventKey =
     @"BrowserActionsContainerKeyEventKey";
 
 namespace {
 const CGFloat kAnimationDuration = 0.2;
 const CGFloat kGrippyWidth = 3.0;
-const CGFloat kMinimumContainerWidth = 3.0;
 }  // namespace
 
 @interface BrowserActionsContainerView(Private)
 // Returns the cursor that should be shown when hovering over the grippy based
 // on |canDragLeft_| and |canDragRight_|.
 - (NSCursor*)appropriateCursorForGrippy;
 
 // Returns the maximum allowed size for the container.
 - (CGFloat)maxAllowedWidth;
 @end
@@ skipping 164 matching lines @@
       postNotificationName:kBrowserActionGrippyDragFinishedNotification
                     object:self];
 }
 
 - (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();
 
-  CGFloat maxAllowedWidth = [self maxAllowedWidth];
+  const CGFloat minWidth = GetLayoutConstant(TOOLBAR_STANDARD_SPACING);
+  const CGFloat maxWidth = std::min([self maxAllowedWidth], maxDesiredWidth_);
 
-  const CGFloat maxWidth = std::min(maxAllowedWidth, maxDesiredWidth_);
-  CGFloat newWidth = NSWidth(containerFrame) + (isRTL ? dX : -dX);
-  newWidth = std::min(std::max(newWidth, kMinimumContainerWidth), maxWidth);
+  const CGFloat oldWidth = NSWidth(self.frame);
+  const CGFloat newWidth =
+      std::min(std::max((isRTL ? location.x : oldWidth - location.x), minWidth),
+               maxWidth);
 
-  BOOL canGrow = NSWidth(containerFrame) < maxWidth;
-  BOOL canShrink = NSWidth(containerFrame) > kMinimumContainerWidth;
+  (isRTL ? canDragLeft_ : canDragRight_) = newWidth < maxWidth;
+  (isRTL ? canDragRight_ : canDragLeft_) = newWidth > minWidth;
 
-  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)
-    return;
+  grippyPinned_ = newWidth == maxWidth;
 
-  grippyPinned_ = newWidth >= maxAllowedWidth;
+  NSRect newFrame = self.frame;
   if (!isRTL)
-    containerFrame.origin.x += dX;
-  containerFrame.size.width = newWidth;
+    newFrame.origin.x += oldWidth - newWidth;
+  newFrame.size.width = newWidth;
 
-  [self setFrame:containerFrame];
+  [self setFrame:newFrame];
   [self setNeedsDisplay:YES];
 
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kBrowserActionGrippyDraggingNotification
                     object:self];
 }
 
 - (void)animationDidEnd:(NSAnimation*)animation {
   // We notify asynchronously so that the animation fully finishes before any
   // listeners do work.
@@ skipping 17 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);
+  width = std::max(width, CGFloat(GetLayoutConstant(TOOLBAR_STANDARD_SPACING)));
   NSRect newFrame = [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;
@@ skipping 58 matching lines @@
     retVal = [NSCursor resizeLeftRightCursor];
   }
   return retVal;
 }
 
 - (CGFloat)maxAllowedWidth {
   return delegate_ ? delegate_->GetMaxAllowedWidth() : CGFLOAT_MAX;
 }
 
 @end