[Mac] Break stale controller refs in infobar close.

chrome/browser/ui/cocoa/infobars/infobar_controller.mm

 // Copyright (c) 2011 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 <Cocoa/Cocoa.h>
 
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
@@ skipping 60 matching lines @@
   if (delegate_->GetIcon()) {
     [image_ setImage:*(delegate_->GetIcon())];
   } else {
     // No icon, remove it from the view and grow the textfield to include the
     // space.
     NSRect imageFrame = [image_ frame];
     NSRect labelFrame = [labelPlaceholder_ frame];
     labelFrame.size.width += NSMinX(imageFrame) - NSMinX(labelFrame);
     labelFrame.origin.x = imageFrame.origin.x;
     [image_ removeFromSuperview];
+    image_ = nil;
     [labelPlaceholder_ setFrame:labelFrame];
   }
   [self initializeLabel];
 
   [self addAdditionalControls];
 
   infoBarView_.tipApex = [self pointForTipApex];
   [infoBarView_ setInfobarType:delegate_->GetInfoBarType()];
 }
 
+- (void)dealloc {
+  [okButton_ setTarget:nil];
+  [cancelButton_ setTarget:nil];
+  [closeButton_ setTarget:nil];
+  [super dealloc];
+}
+
 // Called when someone clicks on the embedded link.
 - (BOOL) textView:(NSTextView*)textView
     clickedOnLink:(id)link
           atIndex:(NSUInteger)charIndex {
   if ([self respondsToSelector:@selector(linkClicked)])
     [self performSelector:@selector(linkClicked)];
   return YES;
 }
 
 // Called when someone clicks on the ok button.
@@ skipping 68 matching lines @@
 
 - (void)infobarWillClose {
   // Default implementation does nothing.
 }
 
 - (void)removeButtons {
   // Extend the label all the way across.
   NSRect labelFrame = [label_.get() frame];
   labelFrame.size.width = NSMaxX([cancelButton_ frame]) - NSMinX(labelFrame);
   [okButton_ removeFromSuperview];
+  okButton_ = nil;
   [cancelButton_ removeFromSuperview];
+  cancelButton_ = nil;
   [label_.get() setFrame:labelFrame];
 }
 
 @end
 
 @implementation InfoBarController (PrivateMethods)
 
 - (void)initializeLabel {
   // Replace the label placeholder NSTextField with the real label NSTextView.
   // The former doesn't show links in a nice way, but the latter can't be added
@@ skipping 162 matching lines @@
     okButtonFrame = [okButton_ frame];
 
     // Position the ok button to the left of the Close button.
     okButtonFrame.origin.x = rightEdge - okButtonFrame.size.width;
     [okButton_ setFrame:okButtonFrame];
 
     // Update the rightEdge
     rightEdge = NSMinX(okButtonFrame);
   } else {
     [okButton_ removeFromSuperview];
+    okButton_ = nil;
   }
 
   // Update and position the Cancel button if needed.  Otherwise, hide it.
   if (visibleButtons & ConfirmInfoBarDelegate::BUTTON_CANCEL) {
     [cancelButton_ setTitle:base::SysUTF16ToNSString(
           delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL))];
     [GTMUILocalizerAndLayoutTweaker sizeToFitView:cancelButton_];
     cancelButtonFrame = [cancelButton_ frame];
 
     // If we had a Ok button, leave space between the buttons.
     if (visibleButtons & ConfirmInfoBarDelegate::BUTTON_OK) {
       rightEdge -= spaceBetweenButtons;
     }
 
     // Position the Cancel button on our current right edge.
     cancelButtonFrame.origin.x = rightEdge - cancelButtonFrame.size.width;
     [cancelButton_ setFrame:cancelButtonFrame];
 
     // Update the rightEdge.
     rightEdge = NSMinX(cancelButtonFrame);
   } else {
     [cancelButton_ removeFromSuperview];
+    cancelButton_ = nil;
   }
 
   // If we had either button, leave space before the edge of the textfield.
   if ((visibleButtons & ConfirmInfoBarDelegate::BUTTON_CANCEL) ||
       (visibleButtons & ConfirmInfoBarDelegate::BUTTON_OK)) {
     rightEdge -= spaceBeforeButtons;
   }
 
   NSRect frame = [label_.get() frame];
   DCHECK(rightEdge > NSMinX(frame))
@@ skipping 40 matching lines @@
   LinkInfoBarController* controller =
       [[LinkInfoBarController alloc] initWithDelegate:this owner:owner];
   return new InfoBar(controller, this);
 }
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar(TabContentsWrapper* owner) {
   ConfirmInfoBarController* controller =
       [[ConfirmInfoBarController alloc] initWithDelegate:this owner:owner];
   return new InfoBar(controller, this);
 }