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

chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTAINER_VIEW_
 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTAINER_VIEW_
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
@@ skipping 31 matching lines @@
 extern NSString* const kBrowserActionsContainerKeyEventKey;
 
 // The possible key actions to process.
 enum BrowserActionsContainerKeyAction {
   BROWSER_ACTIONS_INCREMENT_FOCUS = 0,
   BROWSER_ACTIONS_DECREMENT_FOCUS = 1,
   BROWSER_ACTIONS_EXECUTE_CURRENT = 2,
   BROWSER_ACTIONS_INVALID_KEY_ACTION = 3,
 };
 
-class BrowserActionsContainerViewSizeDelegate {
- public:
-  virtual CGFloat GetMaxAllowedWidth() = 0;
-  virtual ~BrowserActionsContainerViewSizeDelegate() {}
-};
-
 // The view that encompasses the Browser Action buttons in the toolbar and
 // provides mechanisms for resizing.
 @interface BrowserActionsContainerView : NSView<NSAnimationDelegate> {
  @private
   // The frame encompasing the grippy used for resizing the container.
   NSRect grippyRect_;
 
-  // Used to cache the original position within the container that initiated the
-  // drag.
-  NSPoint initialDragPoint_;
-
-  // The maximum width the container could want; i.e., the width required to
-  // display all the icons.
-  CGFloat maxDesiredWidth_;
+  // Remember where in the grippy the drag began.
+  CGFloat dragOffset_;
 
   // Whether the container is currently being resized by the user.
   BOOL userIsResizing_;
 
   // Whether the user can resize the container; this is disabled for overflow
   // (where it would make no sense) and during highlighting, since this is a
   // temporary and entirely browser-driven sequence in order to warn the user
   // about potentially dangerous items.
   BOOL resizable_;
 
   // Whether or not the container is the overflow container, and is shown in the
   // app menu.
   BOOL isOverflow_;
 
-  // Whether the user is allowed to drag the grippy to the left. NO if all
-  // extensions are shown or the location bar has hit its minimum width (handled
-  // within toolbar_controller.mm).
-  BOOL canDragLeft_;
-
-  // Whether the user is allowed to drag the grippy to the right. NO if all
-  // extensions are hidden.
-  BOOL canDragRight_;
-
   // When the left grippy is pinned, resizing the window has no effect on its
   // position. This prevents it from overlapping with other elements as well
   // as letting the container expand when the window is going from super small
   // to large.
   BOOL grippyPinned_;
 
   // The nine-grid of the highlight to paint, if any.
   std::unique_ptr<ui::NinePartImageIds> highlight_;
 
-  // The size delegate, if any.
-  // Weak; delegate is responsible for adding/removing itself.
-  BrowserActionsContainerViewSizeDelegate* sizeDelegate_;
-
   base::scoped_nsobject<NSViewAnimation> resizeAnimation_;
 }
 
 // Sets whether or not the container is the overflow container.
 - (void)setIsOverflow:(BOOL)isOverflow;
 
 // Sets whether or not the container is highlighting.
 - (void)setHighlight:(std::unique_ptr<ui::NinePartImageIds>)highlight;
 
 // Reeturns true if the container is currently highlighting.
 - (BOOL)isHighlighting;
 
 // Resizes the container to the given ideal width, optionally animating.
 - (void)resizeToWidth:(CGFloat)width animate:(BOOL)animate;
 
 // Returns the frame of the container after the running animation has finished.
 // If no animation is running, returns the container's current frame.
 - (NSRect)animationEndFrame;
 
 // Returns true if the view is animating.
 - (BOOL)isAnimating;
 
 // Stops any animation in progress.
 - (void)stopAnimation;
 
-@property(nonatomic) BOOL canDragLeft;
-@property(nonatomic) BOOL canDragRight;
+@property(nonatomic) CGFloat minWidth;
+@property(nonatomic) CGFloat maxWidth;
 @property(nonatomic) BOOL grippyPinned;
-@property(nonatomic) CGFloat maxDesiredWidth;
 @property(readonly, nonatomic) BOOL userIsResizing;
-@property(nonatomic) BrowserActionsContainerViewSizeDelegate* delegate;
 
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTAINER_VIEW_