[Mac] Enables drag N' drop for the buttons within the Browser Actions contain...

chrome/browser/cocoa/toolbar_controller.mm

 // 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.
 
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
@@ skipping 621 matching lines @@
         addObserver:self
            selector:@selector(browserActionsVisibilityChanged:)
                name:kBrowserActionVisibilityChangedNotification
              object:browserActionsController_];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(adjustBrowserActionsContainerForNewWindow:)
                name:NSWindowDidBecomeKeyNotification
              object:[[self view] window]];
   }
-
-  CGFloat dX = NSWidth([browserActionsContainerView_ frame]) * -1;
-  [self adjustLocationAndGoPositionsBy:dX animate:NO];
+  CGFloat containerWidth = [browserActionsContainerView_ isHidden] ? 0.0 :
+      NSWidth([browserActionsContainerView_ frame]);
+  if (containerWidth > 0.0)
+    [self adjustLocationAndGoPositionsBy:(containerWidth * -1) animate:NO];
   BOOL rightBorderShown = !([pageButton_ isHidden] && [wrenchButton_ isHidden]);
   [browserActionsContainerView_ setRightBorderShown:rightBorderShown];
 }
 
 - (void)adjustBrowserActionsContainerForNewWindow:
     (NSNotification*)notification {
   [self toolbarFrameChanged];
   [[NSNotificationCenter defaultCenter]
       removeObserver:self
                 name:NSWindowDidBecomeKeyNotification
@@ skipping 12 matching lines @@
 - (void)browserActionsContainerDragFinished:(NSNotification*)notification {
   [browserActionsController_ resizeContainerAndAnimate:YES];
   [self pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:YES];
 }
 
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification {
   [self pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:NO];
 }
 
 - (void)pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate {
-  NSRect goFrame = [goButton_ frame];
-  NSRect containerFrame = animate ?
-      [browserActionsContainerView_ animationEndFrame] :
-      [browserActionsContainerView_ frame];
+  CGFloat goXPos = [goButton_ frame].origin.x + NSWidth([goButton_ frame]);
+  CGFloat leftPadding;
 
-  CGFloat leftPadding = containerFrame.origin.x -
-      (goFrame.origin.x + NSWidth(goFrame));
+  if ([browserActionsContainerView_ isHidden]) {
+    leftPadding = NSWidth([[goButton_ window] frame]) - goXPos;
+  } else {
+    NSRect containerFrame = animate ?
+        [browserActionsContainerView_ animationEndFrame] :
+        [browserActionsContainerView_ frame];
+
+    leftPadding = containerFrame.origin.x - goXPos;
+  }
   if (leftPadding != kBrowserActionsContainerLeftPadding) {
     CGFloat dX = leftPadding - kBrowserActionsContainerLeftPadding;
     [self adjustLocationAndGoPositionsBy:dX animate:animate];
   }
 }
 
 - (void)maintainMinimumLocationBarWidth {
   CGFloat locationBarWidth = NSWidth([locationBar_ frame]);
   locationBarAtMinSize_ = locationBarWidth <= kMinimumLocationBarWidth;
   if (locationBarAtMinSize_) {
@@ skipping 195 matching lines @@
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 @end