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

chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

 // Copyright (c) 2012 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_controller.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 117 matching lines @@
                   withBounds:(NSRect)bounds;
 
 // Moves the given button both visually and within the toolbar model to the
 // specified index.
 - (void)moveButton:(BrowserActionButton*)button
            toIndex:(NSUInteger)index;
 
 // Handles clicks for BrowserActionButtons.
 - (BOOL)browserActionClicked:(BrowserActionButton*)button;
 
-// Updates the container's grippy cursor based on the number of hidden buttons.
-- (void)updateGrippyCursors;
-
 // Returns the associated ToolbarController.
 - (ToolbarController*)toolbarController;
 
 // Creates a message bubble with the given |delegate|.
 - (void)createMessageBubble:
     (std::unique_ptr<ToolbarActionsBarBubbleDelegate>)delegate;
 
 // Called when the window for the active bubble is closing, and sets the active
 // bubble to nil.
 - (void)bubbleWindowClosing:(NSNotification*)notification;
@@ skipping 91 matching lines @@
 
 void ToolbarActionsBarBridge::ShowToolbarActionBubble(
     std::unique_ptr<ToolbarActionsBarBubbleDelegate> bubble) {
   [controller_ createMessageBubble:std::move(bubble)];
 }
 
 }  // namespace
 
 @implementation BrowserActionsController
 
+@synthesize maxWidth = maxWidth_;
 @synthesize containerView = containerView_;
 @synthesize browser = browser_;
 @synthesize isOverflow = isOverflow_;
 @synthesize activeBubble = activeBubble_;
 
 #pragma mark -
 #pragma mark Public Methods
 
 - (id)initWithBrowser:(Browser*)browser
         containerView:(BrowserActionsContainerView*)container
        mainController:(BrowserActionsController*)mainController {
   DCHECK(browser && container);
 
   if ((self = [super init])) {
     browser_ = browser;
     isOverflow_ = mainController != nil;
 
     toolbarActionsBarBridge_.reset(new ToolbarActionsBarBridge(self));
     ToolbarActionsBar* mainBar =
         mainController ? [mainController toolbarActionsBar] : nullptr;
     toolbarActionsBar_.reset(
         new ToolbarActionsBar(toolbarActionsBarBridge_.get(),
                               browser_,
                               mainBar));
 
     containerView_ = container;
+    [containerView_ setMinWidth:toolbarActionsBar_->GetMinimumWidth()];
     [containerView_ setPostsFrameChangedNotifications:YES];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(containerFrameChanged:)
                name:NSViewFrameDidChangeNotification
              object:containerView_];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(containerDragStart:)
                name:kBrowserActionGrippyDragStartedNotification
@@ skipping 19 matching lines @@
       addObserver:self
          selector:@selector(actionButtonDragFinished:)
              name:kBrowserActionButtonDragEndNotification
            object:nil];
 
     if (isOverflow_)
       toolbarActionsBar_->SetOverflowRowWidth(NSWidth([containerView_ frame]));
 
     buttons_.reset([[NSMutableArray alloc] init]);
     toolbarActionsBar_->CreateActions();
-    [self updateGrippyCursors];
     [container setIsOverflow:isOverflow_];
 
     focusedViewIndex_ = -1;
   }
 
   return self;
 }
 
 - (void)dealloc {
   [self browserWillBeDestroyed];
@@ skipping 70 matching lines @@
         [buttons_ count] - toolbarActionsBar_->GetIconCount() : -1;
     [self setFocusedViewIndex:index];
   }
 }
 
 - (gfx::Size)sizeForOverflowWidth:(int)maxWidth {
   toolbarActionsBar_->SetOverflowRowWidth(maxWidth);
   return [self preferredSize];
 }
 
+- (void)updateMaxWidth {
+  const CGFloat ownMaxWidth = toolbarActionsBar_->GetMaximumWidth();
+  containerView_.maxWidth =
+      (maxWidth_ ? std::min(maxWidth_, ownMaxWidth) : ownMaxWidth);
+}
+
+- (void)setMaxWidth:(CGFloat)maxWidth {
+  maxWidth_ = maxWidth;
+  [self updateMaxWidth];
+}
+
 - (void)addViewForAction:(ToolbarActionViewController*)action
                withIndex:(NSUInteger)index {
   NSRect buttonFrame = NSMakeRect(NSMaxX([containerView_ bounds]),
                                   0,
                                   ToolbarActionsBar::IconWidth(false),
                                   ToolbarActionsBar::IconHeight());
   BrowserActionButton* newButton =
       [[[BrowserActionButton alloc]
          initWithFrame:buttonFrame
         viewController:action
             controller:self] autorelease];
   [newButton setTarget:self];
   [newButton setAction:@selector(browserActionClicked:)];
   [buttons_ insertObject:newButton atIndex:index];
 
+  [self updateMaxWidth];
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(actionButtonDragging:)
              name:kBrowserActionButtonDraggingNotification
            object:newButton];
-
-  [containerView_ setMaxDesiredWidth:toolbarActionsBar_->GetMaximumWidth()];
 }
 
 - (void)redraw {
   if (![self updateContainerVisibility])
     return;  // Container is hidden; no need to update.
 
   std::unique_ptr<ui::NinePartImageIds> highlight;
   if (toolbarActionsBar_->is_highlighting()) {
     highlight.reset(
         new ui::NinePartImageIds(IMAGE_GRID(IDR_DEVELOPER_MODE_HIGHLIGHT)));
@@ skipping 58 matching lines @@
   // |buttons_|, so make sure we retain a reference.
   base::scoped_nsobject<BrowserActionButton> button(
       [[self buttonForId:action->GetId()] retain]);
 
   // Note: We remove the button from the view and the buttons list first because
   // destroying it (or calling -onRemoved) can cause redraws, and we don't want
   // to include it when the view is gone.
   [button removeFromSuperview];
   [buttons_ removeObject:button];
 
+  [self updateMaxWidth];
   [button onRemoved];
-
-  [containerView_ setMaxDesiredWidth:toolbarActionsBar_->GetMaximumWidth()];
 }
 
 - (void)removeAllViews {
   for (BrowserActionButton* button in buttons_.get()) {
     [button removeFromSuperview];
     [button onRemoved];
   }
   [buttons_ removeAllObjects];
 }
 
 - (void)resizeContainerToWidth:(CGFloat)width {
   // Cocoa goes a little crazy if we try and change animations while adjusting
   // child frames (i.e., the buttons). If the toolbar is already animating,
   // just jump to the new frame. (This typically only happens if someone is
   // "spamming" a button to add/remove an action.) If the window isn't visible
   // (for example it's in the process of being created), don't bother animating.
   BOOL animate = !toolbarActionsBar_->suppress_animation() &&
       ![containerView_ isAnimating] && [[containerView_ window] isVisible];
   [self updateContainerVisibility];
   [containerView_ resizeToWidth:width
                         animate:animate];
   [containerView_ setNeedsDisplay:YES];
 
   if (!animate) {
     [[NSNotificationCenter defaultCenter]
         postNotificationName:kBrowserActionVisibilityChangedNotification
                       object:self];
   }
   [self redraw];
-  [self updateGrippyCursors];
+  [[containerView_ window] invalidateCursorRectsForView:containerView_];
 }
 
 - (BOOL)updateContainerVisibility {
   BOOL hidden = [buttons_ count] == 0;
   if ([containerView_ isHidden] != hidden)
     [containerView_ setHidden:hidden];
   return !hidden;
 }
 
 - (void)updateButtonOpacity {
@@ skipping 64 matching lines @@
 - (void)containerDragStart:(NSNotification*)notification {
   for (BrowserActionButton* button in buttons_.get()) {
     if ([button superview] != containerView_) {
       [button setAlphaValue:1.0];
       [containerView_ addSubview:button];
     }
   }
 }
 
 - (void)containerDragFinished:(NSNotification*)notification {
-  for (BrowserActionButton* button in buttons_.get()) {
-    NSRect buttonFrame = [button frame];
-    if (NSContainsRect([containerView_ bounds], buttonFrame))
-      continue;
-
-    CGFloat intersectionWidth =
-        NSWidth(NSIntersectionRect([containerView_ bounds], buttonFrame));
-    // Hide the button if it's not "mostly" visible. "Mostly" here equates to
-    // having three or fewer pixels hidden.
-    if (([containerView_ grippyPinned] && intersectionWidth > 0) ||
-        (intersectionWidth <= NSWidth(buttonFrame) - 3.0)) {
-      [button setAlphaValue:0.0];
-      [button removeFromSuperview];
-    }
-  }
-
-  toolbarActionsBar_->OnResizeComplete(
-      toolbarActionsBar_->IconCountToWidth([self visibleButtonCount]));
-
-  [self updateGrippyCursors];
-  [self resizeContainerToWidth:toolbarActionsBar_->GetPreferredSize().width()];
+  toolbarActionsBar_->OnResizeComplete(NSWidth(containerView_.bounds));
+  [[containerView_ window] invalidateCursorRectsForView:containerView_];
 }
 
 - (void)containerAnimationEnded:(NSNotification*)notification {
   if (![containerView_ isAnimating])
     toolbarActionsBar_->OnAnimationEnded();
 }
 
 - (void)containerKeyEvent:(NSNotification*)notification {
   DCHECK(isOverflow_);  // We only manually process key events in overflow.
 
@@ skipping 123 matching lines @@
   if (!NSEqualRects(buttonFrame, [button frameAfterAnimation])) {
     [button setFrame:buttonFrame
              animate:!toolbarActionsBar_->suppress_animation() && !isOverflow_];
   }
 }
 
 - (BOOL)browserActionClicked:(BrowserActionButton*)button {
   return [button viewController]->ExecuteAction(true);
 }
 
-- (void)updateGrippyCursors {
-  BOOL canClose = [self visibleButtonCount] > 0;
-  BOOL canOpen = toolbarActionsBar_->GetIconCount() != [buttons_ count];
-  [containerView_
-      setCanDragLeft:cocoa_l10n_util::ShouldDoExperimentalRTLLayout()
-                         ? canClose
-                         : canOpen];
-  [containerView_
-      setCanDragRight:cocoa_l10n_util::ShouldDoExperimentalRTLLayout()
-                          ? canOpen
-                          : canClose];
-  [[containerView_ window] invalidateCursorRectsForView:containerView_];
-}
-
 - (ToolbarController*)toolbarController {
   return [[BrowserWindowController browserWindowControllerForWindow:
              browser_->window()->GetNativeWindow()] toolbarController];
 }
 
 - (void)createMessageBubble:
     (std::unique_ptr<ToolbarActionsBarBubbleDelegate>)delegate {
   NSView* anchorView = nil;
   BOOL anchoredToAction = NO;
   if (!delegate->GetAnchorActionId().empty()) {
@@ skipping 38 matching lines @@
 }
 
 #pragma mark -
 #pragma mark Testing Methods
 
 - (BrowserActionButton*)buttonWithIndex:(NSUInteger)index {
   return index < [buttons_ count] ? [buttons_ objectAtIndex:index] : nil;
 }
 
 @end