Merge 57399 - Try to fix top crasher....

chrome/browser/cocoa/bookmark_bar_folder_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/bookmark_bar_folder_controller.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ skipping 127 matching lines @@
 }
 
 - (void)dealloc {
   // The button is no longer part of the menu path.
   [parentButton_ forceButtonBorderToStayOnAlways:NO];
   [parentButton_ setNeedsDisplay];
 
   [self removeScrollTracking];
   [self endScroll];
   [hoverState_ draggingExited];
+
+  // Delegate pattern does not retain; make sure pointers to us are removed.
+  for (BookmarkButton* button in buttons_.get()) {
+    [button setDelegate:nil];
+    [button setTarget:nil];
+    [button setAction:nil];
+  }
+
   // Note: we don't need to
   //   [NSObject cancelPreviousPerformRequestsWithTarget:self];
   // Because all of our performSelector: calls use withDelay: which
   // retains us.
   [super dealloc];
 }
 
 // Overriden from NSWindowController to call childFolderWillShow: before showing
 // the window.
 - (void)showWindow:(id)sender {
   [barController_ childFolderWillShow:self];
   [super showWindow:sender];
 }
 
 - (BookmarkButton*)parentButton {
   return parentButton_.get();
 }
 
 - (void)offsetFolderMenuWindow:(NSSize)offset {
   NSWindow* window = [self window];
   NSRect windowFrame = [window frame];
   windowFrame.origin.x -= offset.width;
   windowFrame.origin.y += offset.height;  // Yes, in the opposite direction!
   [window setFrame:windowFrame display:YES];
   [folderController_ offsetFolderMenuWindow:offset];
 }
 
 - (void)reconfigureMenu {
   [NSObject cancelPreviousPerformRequestsWithTarget:self];
-  for (BookmarkButton* button in buttons_.get())
+  for (BookmarkButton* button in buttons_.get()) {
+    [button setDelegate:nil];
     [button removeFromSuperview];
+  }
   [buttons_ removeAllObjects];
   [self configureWindow];
 }
 
 #pragma mark Private Methods
 
 - (BookmarkButtonCell*)cellForBookmarkNode:(const BookmarkNode*)child {
   NSImage* image = child ? [barController_ favIconForNode:child] : nil;
   NSMenu* menu = child ? child->is_folder() ? folderMenu_ : buttonMenu_ : nil;
   BookmarkBarFolderButtonCell* cell =
@@ skipping 1028 matching lines @@
       NSWidth([mainView_ frame]) - 2 * bookmarks::kBookmarkHorizontalPadding -
               bookmarks::kScrollViewContentWidthMargin,
               bookmarks::kBookmarkBarHeight - 2 *
                   bookmarks::kBookmarkVerticalPadding);
   // When adding a button to an empty folder we must remove the 'empty'
   // placeholder button. This can be detected by checking for a parent
   // child count of 1.
   const BookmarkNode* parentNode = node->GetParent();
   if (parentNode->GetChildCount() == 1) {
     BookmarkButton* emptyButton = [buttons_ lastObject];
+    [emptyButton setDelegate:nil];
     [emptyButton removeFromSuperview];
     [buttons_ removeLastObject];
   } else {
     // Set us up to remember the last moved button's frame.
     buttonFrame.origin.y += NSHeight([mainView_ frame]) +
         bookmarks::kBookmarkBarHeight;
   }
 
   if (buttonIndex == -1)
     buttonIndex = [buttons_ count];
@@ skipping 106 matching lines @@
   NSPoint poofPoint = NSMakePoint(NSMidX(poofFrame), NSMidY(poofFrame));
   poofPoint = [oldButton convertPoint:poofPoint toView:nil];
   poofPoint = [[oldButton window] convertBaseToScreen:poofPoint];
 
   // If a hover-open is pending, cancel it.
   if (oldButton == buttonThatMouseIsIn_) {
     [NSObject cancelPreviousPerformRequestsWithTarget:self];
     buttonThatMouseIsIn_ = nil;
   }
 
+  [oldButton setDelegate:nil];
   [oldButton removeFromSuperview];
   if (animate && !ignoreAnimations_)
     NSShowAnimationEffect(NSAnimationEffectDisappearingItemDefault, poofPoint,
                           NSZeroSize, nil, nil, nil);
   [buttons_ removeObjectAtIndex:buttonIndex];
   for (NSInteger i = 0; i < buttonIndex; ++i) {
     BookmarkButton* button = [buttons_ objectAtIndex:i];
     NSRect buttonFrame = [button frame];
     buttonFrame.origin.y -= bookmarks::kBookmarkBarHeight;
     [button setFrame:buttonFrame];
@@ skipping 45 matching lines @@
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 - (BookmarkButton*)buttonThatMouseIsIn {
   return buttonThatMouseIsIn_;
 }
 
 @end  // BookmarkBarFolderController