Add support for replace infobar. The lack of this was a top mac crasher....

chrome/browser/cocoa/infobar_container_controller.mm

 // Copyright (c) 2009 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.
 
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "chrome/browser/cocoa/infobar.h"
 #import "chrome/browser/cocoa/infobar_container_controller.h"
 #import "chrome/browser/cocoa/infobar_controller.h"
 #include "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"
@@ skipping 15 matching lines @@
                const NotificationSource& source,
                const NotificationDetails& details) {
     switch (type.value) {
       case NotificationType::TAB_CONTENTS_INFOBAR_ADDED:
         [controller_ addInfoBar:Details<InfoBarDelegate>(details).ptr()];
         break;
       case NotificationType::TAB_CONTENTS_INFOBAR_REMOVED:
         [controller_
           removeInfoBarsForDelegate:Details<InfoBarDelegate>(details).ptr()];
         break;
+      case NotificationType::TAB_CONTENTS_INFOBAR_REPLACED: {
+        typedef std::pair<InfoBarDelegate*, InfoBarDelegate*>
+            InfoBarDelegatePair;
+        InfoBarDelegatePair* delegates =
+            Details<InfoBarDelegatePair>(details).ptr();
+        [controller_
+         replaceInfoBarsForDelegate:delegates->first with:delegates->second];
+        break;
+      }
       default:
         NOTREACHED();  // we don't ask for anything else!
         break;
     }
 
     [controller_ positionInfoBarsAndRedraw];
   }
 
   InfoBarContainerController* controller_;  // weak, owns us.
 };
@@ skipping 77 matching lines @@
   if (currentTabContents_) {
     for (int i = 0; i < currentTabContents_->infobar_delegate_count(); ++i) {
       [self addInfoBar:currentTabContents_->GetInfoBarDelegateAt(i)];
     }
 
     Source<TabContents> source(currentTabContents_);
     registrar_.Add(infoBarObserver_.get(),
                    NotificationType::TAB_CONTENTS_INFOBAR_ADDED, source);
     registrar_.Add(infoBarObserver_.get(),
                    NotificationType::TAB_CONTENTS_INFOBAR_REMOVED, source);
+    registrar_.Add(infoBarObserver_.get(),
+                   NotificationType::TAB_CONTENTS_INFOBAR_REPLACED, source);
   }
 
   [self positionInfoBarsAndRedraw];
 }
 
 - (void)addInfoBar:(InfoBarDelegate*)delegate {
   scoped_ptr<InfoBar> infobar(delegate->CreateInfoBar());
   InfoBarController* controller = infobar->controller();
   [controller setContainerController:self];
   [[self view] addSubview:[controller view]];
   [infobarControllers_ addObject:[controller autorelease]];
 }
 
 - (void)removeInfoBarsForDelegate:(InfoBarDelegate*)delegate {
   for (InfoBarController* controller in
-           [NSArray arrayWithArray:infobarControllers_.get()]) {
+       [NSArray arrayWithArray:infobarControllers_.get()]) {
     if ([controller delegate] == delegate) {
       // This code can be executed while -[InfoBarController closeInfoBar] is
       // still on the stack, so we retain and autorelease the controller to
       // prevent it from being dealloc'ed too early.
       [[controller retain] autorelease];
       [[controller view] removeFromSuperview];
       [infobarControllers_ removeObject:controller];
     }
   }
 }
 
+- (void)replaceInfoBarsForDelegate:(InfoBarDelegate*)old_delegate
+                              with:(InfoBarDelegate*)new_delegate {
+  // TODO(port): This should avoid animation when we add it.

[Aaron Boodman, 2009/08/24 21:29:07]

Cool, thanks for adding this TODO

[rohitrao (ping after 24h), 2009/08/25 15:57:35]

Feel free to assign this TODO to me.

+  [self removeInfoBarsForDelegate:old_delegate];
+  [self addInfoBar:new_delegate];
+}
+
 - (void)removeAllInfoBars {
   for (InfoBarController* controller in infobarControllers_.get()) {
     [[controller view] removeFromSuperview];
   }
   [infobarControllers_ removeAllObjects];
 }
 
 - (void)positionInfoBarsAndRedraw {
   NSRect containerBounds = [[self view] bounds];
   int minY = 0;
@@ skipping 11 matching lines @@
     frame.origin.y = minY;
     minY += frame.size.height;
     // TODO(rohitrao, jrg): Replace with an animator.
     [view setFrame:frame];
   }
 
   [resizeDelegate_ resizeView:[self view] newHeight:[self desiredHeight]];
 }
 
 @end