Make TabContents own its infobar delegates....

chrome/browser/cocoa/infobar_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 <Cocoa/Cocoa.h>
 
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/animatable_view.h"
@@ skipping 158 matching lines @@
   // Force the frame size to be 0 and then start an animation.
   NSRect frame = [[self view] frame];
   CGFloat finalHeight = frame.size.height;
   frame.size.height = 0;
   [[self view] setFrame:frame];
   [[self animatableView] animateToNewHeight:finalHeight
                                    duration:kAnimateOpenDuration];
 }
 
 - (void)close {
+  delegate_ = NULL;
+
   // Stop any running animations.
   [[self animatableView] stopAnimation];
   infoBarClosing_ = YES;
   [self cleanUpAfterAnimation:YES];
 }
 
 - (void)animateClosed {
+  delegate_ = NULL;
+
   // Start animating closed.  We will receive a notification when the animation
-  // is done, at which point we can remove our view from the hierarchy and
-  // notify the delegate that the infobar was closed.
+  // is done, at which point we can remove our view from the hierarchy.
   [[self animatableView] animateToNewHeight:0 duration:kAnimateCloseDuration];
 
   // The above call may trigger an animationDidStop: notification for any
   // currently-running animations, so do not set |infoBarClosing_| until after
   // starting the animation.
   infoBarClosing_ = YES;
 }
 
 - (void)addAdditionalControls {
   // Default implementation does nothing.
@@ skipping 42 matching lines @@
   [label_.get() setDrawsBackground:NO];
   [label_.get() setHorizontallyResizable:NO];
   [label_.get() setVerticallyResizable:NO];
 }
 
 - (void)removeInfoBar {
   // TODO(rohitrao): This method can be called even if the infobar has already
   // been removed and |delegate_| is NULL.  Is there a way to rewrite the code
   // so that inner event loops don't cause us to try and remove the infobar
   // twice?  http://crbug.com/54253
-  [containerController_ removeDelegate:delegate_];
+  if (delegate_ != NULL)
+    [containerController_ removeDelegate:delegate_];
 }
 
 - (void)cleanUpAfterAnimation:(BOOL)finished {
   // Don't need to do any cleanup if the bar was animating open.
   if (!infoBarClosing_)
     return;
 
-  // Notify the delegate that the infobar was closed.  The delegate may delete
-  // itself as a result of InfoBarClosed(), so we null out its pointer.
-  if (delegate_) {
-    delegate_->InfoBarClosed();
-    delegate_ = NULL;
-  }
-
   // If the animation ran to completion, then we need to remove ourselves from
   // the container.  If the animation was interrupted, then the container will
   // take care of removing us.
   // TODO(rohitrao): UGH!  This works for now, but should be cleaner.
   if (finished)
     [containerController_ removeController:self];
 }
 
 - (void)animationDidStop:(NSAnimation*)animation {
   [self cleanUpAfterAnimation:NO];
@@ skipping 249 matching lines @@
   LinkInfoBarController* controller =
       [[LinkInfoBarController alloc] initWithDelegate:this];
   return new InfoBar(controller);
 }
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
   ConfirmInfoBarController* controller =
       [[ConfirmInfoBarController alloc] initWithDelegate:this];
   return new InfoBar(controller);
 }