[Toolbar UI Mac] Fix omnibox minimum width

chrome/browser/ui/cocoa/toolbar/toolbar_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/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
@@ skipping 63 matching lines @@
 // in Toolbar.xib: the height of the toolbar (35) minus the height of the child
 // elements (29) minus the y-origin of the elements (4).
 const CGFloat kToolbarElementTopPadding = 2.0;
 
 // The minimum width of the location bar in pixels.
 const CGFloat kMinimumLocationBarWidth = 100.0;
 
 // The amount of left padding that the wrench menu should have.
 const CGFloat kWrenchMenuLeftPadding = 3.0;
 
+class BrowserActionsContainerDelegate :
+    public BrowserActionsContainerViewSizeDelegate {
+ public:
+  BrowserActionsContainerDelegate(
+      AutocompleteTextField* location_bar,
+      BrowserActionsContainerView* browser_actions_container_view);
+  ~BrowserActionsContainerDelegate() override;
+
+ private:
+  // BrowserActionsContainerSizeDelegate:
+  CGFloat GetMaxAllowedWidth() override;
+
+  AutocompleteTextField* location_bar_;
+  BrowserActionsContainerView* browser_actions_container_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainerDelegate);
+};
+
+BrowserActionsContainerDelegate::BrowserActionsContainerDelegate(
+    AutocompleteTextField* location_bar,
+    BrowserActionsContainerView* browser_actions_container_view)
+    : location_bar_(location_bar),
+      browser_actions_container_(browser_actions_container_view) {
+  [browser_actions_container_ setDelegate:this];
+}
+
+BrowserActionsContainerDelegate::~BrowserActionsContainerDelegate() {
+  [browser_actions_container_ setDelegate:nil];
+}
+
+CGFloat BrowserActionsContainerDelegate::GetMaxAllowedWidth() {
+  CGFloat location_bar_flex =
+      NSWidth([location_bar_ frame]) - kMinimumLocationBarWidth;
+  return NSWidth([browser_actions_container_ frame]) + location_bar_flex;
+}
+
 }  // namespace
 
 @interface ToolbarController()
 @property(assign, nonatomic) Browser* browser;
 - (void)addAccessibilityDescriptions;
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(const std::string&)prefName;
 - (BackgroundGradientView*)backgroundGradientView;
 - (void)toolbarFrameChanged;
 - (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate;
 - (void)maintainMinimumLocationBarWidth;
 - (void)adjustBrowserActionsContainerForNewWindow:(NSNotification*)notification;
-- (void)browserActionsContainerWillDrag:(NSNotification*)notification;
 - (void)browserActionsContainerDragged:(NSNotification*)notification;
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification;
 - (void)browserActionsContainerWillAnimate:(NSNotification*)notification;
 - (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate;
 - (void)updateWrenchButtonSeverity:(WrenchIconPainter::Severity)severity
                            animate:(BOOL)animate;
 @end
 
 namespace ToolbarControllerInternal {
 
@@ skipping 70 matching lines @@
                              profile:profile
                              browser:browser
                       resizeDelegate:resizeDelegate
                         nibFileNamed:@"Toolbar"])) {
   }
   return self;
 }
 
 
 - (void)dealloc {
+  browserActionsContainerDelegate_.reset();
+
   // Unset ViewIDs of toolbar elements.
   // ViewIDs of |toolbarView|, |reloadButton_|, |locationBar_| and
   // |browserActionsContainerView_| are handled by themselves.
   view_id_util::UnsetID(backButton_);
   view_id_util::UnsetID(forwardButton_);
   view_id_util::UnsetID(homeButton_);
   view_id_util::UnsetID(wrenchButton_);
 
   // Make sure any code in the base class which assumes [self view] is
   // the "parent" view continues to work.
@@ skipping 385 matching lines @@
 }
 
 - (void)prefChanged:(const std::string&)prefName {
   if (prefName == prefs::kShowHomeButton) {
     [self showOptionalHomeButton];
   }
 }
 
 - (void)createBrowserActionButtons {
   if (!browserActionsController_.get()) {
+    browserActionsContainerDelegate_.reset(
+        new BrowserActionsContainerDelegate(locationBar_,
+                                            browserActionsContainerView_));
     browserActionsController_.reset([[BrowserActionsController alloc]
             initWithBrowser:browser_
               containerView:browserActionsContainerView_
              mainController:nil]);
     [[NSNotificationCenter defaultCenter]
         addObserver:self
-           selector:@selector(browserActionsContainerWillDrag:)
-               name:kBrowserActionGrippyWillDragNotification
-             object:browserActionsContainerView_];
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
            selector:@selector(browserActionsContainerDragged:)
                name:kBrowserActionGrippyDraggingNotification
              object:browserActionsContainerView_];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(browserActionsVisibilityChanged:)
                name:kBrowserActionVisibilityChangedNotification
              object:browserActionsController_];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
@@ skipping 17 matching lines @@
   [self toolbarFrameChanged];
   [[NSNotificationCenter defaultCenter]
       removeObserver:self
                 name:NSWindowDidBecomeKeyNotification
               object:[[self view] window]];
 }
 
 - (void)browserActionsContainerDragged:(NSNotification*)notification {
   CGFloat locationBarWidth = NSWidth([locationBar_ frame]);
   locationBarAtMinSize_ = locationBarWidth <= kMinimumLocationBarWidth;
-  [browserActionsContainerView_ setCanDragLeft:!locationBarAtMinSize_];
-  [browserActionsContainerView_ setGrippyPinned:locationBarAtMinSize_];
   [self adjustLocationSizeBy:
       [browserActionsContainerView_ resizeDeltaX] animate:NO];
 }
 
-- (void)browserActionsContainerWillDrag:(NSNotification*)notification {
-  CGFloat deltaX = [[notification.userInfo objectForKey:kTranslationWithDelta]
-      floatValue];
-  CGFloat locationBarWidth = NSWidth([locationBar_ frame]);
-  BOOL locationBarWillBeAtMinSize =
-      (locationBarWidth + deltaX) <= kMinimumLocationBarWidth;
-
-  // Prevent the |browserActionsContainerView_| from dragging if the width of
-  // location bar will reach the minimum.
-  [browserActionsContainerView_ setCanDragLeft:!locationBarWillBeAtMinSize];
-}
-
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification {
   [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
 }
 
 - (void)browserActionsContainerWillAnimate:(NSNotification*)notification {
   [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:YES];
 }
 
 - (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate {
   CGFloat locationBarXPos = NSMaxX([locationBar_ frame]);
-  CGFloat leftDistance;
+  CGFloat leftDistance = 0.0;
 
   if ([browserActionsContainerView_ isHidden]) {
     CGFloat edgeXPos = [wrenchButton_ frame].origin.x;
     leftDistance = edgeXPos - locationBarXPos - kWrenchMenuLeftPadding;
   } else {
     leftDistance = NSMinX([browserActionsContainerView_ animationEndFrame]) -
         locationBarXPos;
   }
   if (leftDistance != 0.0)
     [self adjustLocationSizeBy:leftDistance animate:animate];
@@ skipping 187 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end