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

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 85 matching lines @@
 // Toolbar buttons are 24x24 and centered in a 28x28 space, so there is a 2pt-
 // wide inset.
 const CGFloat kButtonInset = 2;
 
 // The y-offset of the browser actions container from the location bar.
 const CGFloat kContainerYOffset = 2;
 
 // The minimum width of the location bar in pixels.
 const CGFloat kMinimumLocationBarWidth = 100.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;
 // Height of the location bar. Used for animating the toolbar in and out when
 // the location bar is displayed stand-alone for bookmark apps.
 + (CGFloat)locationBarHeight;
 // Return the amount of horizontal padding that the app menu should have on
 // each side.
 + (CGFloat)appMenuPadding;
@@ skipping 369 matching lines @@
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 
   if (trackingArea_.get()) {
     [[self view] removeTrackingArea:trackingArea_.get()];
     [trackingArea_.get() clearOwner];
     trackingArea_.reset();
   }
 
   // Destroy owned objects that hold a weak Browser*.
   locationBarView_.reset();
-  browserActionsContainerDelegate_.reset();
   browser_ = nullptr;
 }
 
 - (void)addAccessibilityDescriptions {
   // Set accessibility descriptions. http://openradar.appspot.com/7496255
   NSString* description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_BACK);
   [[backButton_ cell]
       accessibilitySetOverrideValue:description
                        forAttribute:NSAccessibilityDescriptionAttribute];
   NSString* helpTag = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_TOOLTIP_BACK);
@@ skipping 237 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(browserActionsContainerDragged:)
                name:kBrowserActionGrippyDraggingNotification
              object:browserActionsContainerView_];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(browserActionsVisibilityChanged:)
                name:kBrowserActionVisibilityChangedNotification
              object:browserActionsController_];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(browserActionsContainerWillAnimate:)
                name:kBrowserActionsContainerWillAnimate
              object:browserActionsContainerView_];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(adjustBrowserActionsContainerForNewWindow:)
                name:NSWindowDidBecomeKeyNotification
              object:[[self view] window]];
   }
-  if (![browserActionsContainerView_ isHidden])
-    [self pinLocationBarBeforeBrowserActionsContainerAndAnimate:NO];
+  [self pinLocationBarBeforeBrowserActionsContainerAndAnimate:NO];
 }
 
 - (void)updateVisibility:(BOOL)visible withAnimation:(BOOL)animate {
   CGFloat newHeight = visible ? [ToolbarController locationBarHeight] : 0;
 
   // Perform the animation, which will cause the BrowserWindowController to
   // resize this view in the browser layout as required.
   if (animate) {
     [[self toolbarView] animateToNewHeight:newHeight
                                   duration:kToolBarAnimationDuration];
@@ skipping 39 matching lines @@
     CGFloat rightEdge = NSMaxX([locationBar_ frame]);
     if ([browserActionsContainerView_ isHidden]) {
       delta = NSMinX([appMenuButton_ frame]) -
               [ToolbarController appMenuPadding] - kButtonInset - rightEdge;
     } else {
       delta = NSMinX([browserActionsContainerView_ animationEndFrame]) -
               kButtonInset - rightEdge;
     }
   }
 
-  if (delta != 0.0)
-    [self adjustLocationSizeBy:delta animate:animate];
-  else
-    [locationBar_ stopAnimation];
+  [self adjustLocationSizeBy:delta animate:animate];
 }
 
 - (void)maintainMinimumLocationBarWidth {
   CGFloat locationBarWidth = NSWidth([locationBar_ frame]);
   locationBarAtMinSize_ = locationBarWidth <= kMinimumLocationBarWidth;
   if (locationBarAtMinSize_) {
     CGFloat dX = kMinimumLocationBarWidth - locationBarWidth;
     [self adjustLocationSizeBy:dX animate:NO];
   }
 }
@@ skipping 80 matching lines @@
 
   [backButton_ setHidden:YES];
   [forwardButton_ setHidden:YES];
   [reloadButton_ setHidden:YES];
   [appMenuButton_ setHidden:YES];
   [homeButton_ setHidden:YES];
   [browserActionsContainerView_ setHidden:YES];
 }
 
 - (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate {
+  NSRect locationFrame = [locationBar_ frame];
+
+  CGFloat location_bar_flex = NSWidth(locationFrame) - kMinimumLocationBarWidth;
+  [browserActionsController_
+      setMaxWidth:NSWidth(browserActionsContainerView_.frame) +
+                  location_bar_flex];
+
+  [locationBar_ stopAnimation];
+
+  if (dX == 0)
+    return;
+
   // Ensure that the location bar is in its proper place.
-  NSRect locationFrame = [locationBar_ frame];
   locationFrame.size.width += dX;
   if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout())
     locationFrame.origin.x -= dX;
 
-  [locationBar_ stopAnimation];
   if (animate)
     [locationBar_ animateToFrame:locationFrame];
   else
     [locationBar_ setFrame:locationFrame];
 }
 
 - (NSPoint)bookmarkBubblePoint {
   if (locationBarView_->IsStarEnabled())
     return locationBarView_->GetBubblePointForDecoration(
         locationBarView_->star_decoration());
@@ skipping 125 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end