[Toolbar UI Mac] Fix omnibox minimum width

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 "base/basictypes.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 
 NSString* const kBrowserActionGrippyDragStartedNotification =
     @"BrowserActionGrippyDragStartedNotification";
 NSString* const kBrowserActionGrippyDraggingNotification =
     @"BrowserActionGrippyDraggingNotification";
 NSString* const kBrowserActionGrippyDragFinishedNotification =
     @"BrowserActionGrippyDragFinishedNotification";
-NSString* const kBrowserActionGrippyWillDragNotification =
-    @"BrowserActionGrippyWillDragNotification";
 NSString* const kBrowserActionsContainerWillAnimate =
     @"BrowserActionsContainerWillAnimate";
 NSString* const kBrowserActionsContainerMouseEntered =
     @"BrowserActionsContainerMouseEntered";
 NSString* const kTranslationWithDelta =
     @"TranslationWithDelta";
 
 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
 
 @implementation BrowserActionsContainerView
 
 @synthesize canDragLeft = canDragLeft_;
 @synthesize canDragRight = canDragRight_;
 @synthesize grippyPinned = grippyPinned_;
-@synthesize maxWidth = maxWidth_;
+@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]));
     canDragLeft_ = YES;
     canDragRight_ = YES;
     resizable_ = YES;
@@ skipping 93 matching lines @@
   if (!userIsResizing_)
     return;
 
   NSPoint location = [self convertPoint:[theEvent locationInWindow]
                                fromView:nil];
   NSRect containerFrame = [self frame];
   CGFloat dX = [theEvent deltaX];
   CGFloat withDelta = location.x - dX;
   canDragRight_ = (withDelta >= initialDragPoint_.x) &&
       (NSWidth(containerFrame) > kMinimumContainerWidth);
-  canDragLeft_ = (withDelta <= initialDragPoint_.x) &&
-      (NSWidth(containerFrame) < maxWidth_);
-
-  // Notify others to see whether this dragging is allowed.
-  if ((dX < 0.0 && canDragLeft_) || (dX > 0.0 && canDragRight_)) {
-    NSDictionary* userInfo = @{ kTranslationWithDelta : @(dX) };
-    [[NSNotificationCenter defaultCenter]
-        postNotificationName:kBrowserActionGrippyWillDragNotification
-                      object:self
-                    userInfo:userInfo];
-  }
+  CGFloat maxAllowedWidth = [self maxAllowedWidth];
+  containerFrame.size.width =
+      std::max(NSWidth(containerFrame) - dX, kMinimumContainerWidth);
+  canDragLeft_ = withDelta <= initialDragPoint_.x &&
+      NSWidth(containerFrame) < maxDesiredWidth_ &&
+      NSWidth(containerFrame) < maxAllowedWidth;
 
   if ((dX < 0.0 && !canDragLeft_) || (dX > 0.0 && !canDragRight_))
     return;
 
-  containerFrame.size.width =
-      std::max(NSWidth(containerFrame) - dX, kMinimumContainerWidth);
-
   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];
 
   lastXPos_ += dX;
 }
 
 - (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 frame = [self frame];
+
+  CGFloat maxAllowedWidth = [self maxAllowedWidth];
+  if (width > maxAllowedWidth)
+    width = maxAllowedWidth;

[Avi (use Gerrit), 2015/03/13 23:26:03]

std::min? (parallel to line 195)

[Devlin, 2015/03/14 00:03:14]

Done.

+
   lastXPos_ = frame.origin.x;
   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]
     };
     [resizeAnimation_ setViewAnimations:@[ animationDictionary ]];
     [resizeAnimation_ startAnimation];
@@ skipping 42 matching lines @@
   } else if (!canDragLeft_) {
     retVal = [NSCursor resizeRightCursor];
   } else if (!canDragRight_) {
     retVal = [NSCursor resizeLeftCursor];
   } else {
     retVal = [NSCursor resizeLeftRightCursor];
   }
   return retVal;
 }
 
+- (CGFloat)maxAllowedWidth {
+  return delegate_ ? delegate_->GetMaxAllowedWidth() : CGFLOAT_MAX;
+}
+
 @end