Make TabContents own its infobar delegates....

chrome/browser/gtk/infobar_container_gtk.cc

 // 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.
 
 #include "chrome/browser/gtk/infobar_container_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 105 matching lines @@
 // InfoBarContainerGtk, NotificationObserver implementation: -------------------
 
 void InfoBarContainerGtk::Observe(NotificationType type,
                                   const NotificationSource& source,
                                   const NotificationDetails& details) {
   if (type == NotificationType::TAB_CONTENTS_INFOBAR_ADDED) {
     AddInfoBar(Details<InfoBarDelegate>(details).ptr(), true);
   } else if (type == NotificationType::TAB_CONTENTS_INFOBAR_REMOVED) {
     RemoveInfoBar(Details<InfoBarDelegate>(details).ptr(), true);
   } else if (type == NotificationType::TAB_CONTENTS_INFOBAR_REPLACED) {
-    std::pair<InfoBarDelegate*, InfoBarDelegate*>* delegates =
-        Details<std::pair<InfoBarDelegate*, InfoBarDelegate*> >(details).ptr();
+    typedef std::pair<InfoBarDelegate*, InfoBarDelegate*> DelegatePair;
+    DelegatePair* delegate_pair = Details<DelegatePair>(details).ptr();
 
     // By not animating the removal/addition, this appears to be a replace.
-    RemoveInfoBar(delegates->first, false);
-    AddInfoBar(delegates->second, false);
+    RemoveInfoBar(delegate_pair->first, false);
+    AddInfoBar(delegate_pair->second, false);
   } else {
     NOTREACHED();
   }
 }
 
 // InfoBarContainerGtk, private: -----------------------------------------------
 
 void InfoBarContainerGtk::UpdateInfoBars() {
   for (int i = 0; i < tab_contents_->infobar_delegate_count(); ++i) {
     InfoBarDelegate* delegate = tab_contents_->GetInfoBarDelegateAt(i);
     AddInfoBar(delegate, false);
   }
 }
 
 void InfoBarContainerGtk::ShowArrowForDelegate(InfoBarDelegate* delegate,
                                                bool animate) {
   GList* children = gtk_container_get_children(GTK_CONTAINER(widget()));
   if (!children)
     return;
 
   // Iterate through the infobars and find the last one that isn't closing.
   InfoBar* last_bar = NULL;
   InfoBar* this_bar = NULL;
   for (GList* iter = children; iter != NULL; iter = iter->next) {
     this_bar = reinterpret_cast<InfoBar*>(
         g_object_get_data(G_OBJECT(iter->data), kInfoBar));
 
-    if (this_bar->delegate() == delegate)
+    if ((delegate != NULL) && (this_bar->delegate() == delegate))
       break;
 
     if (!this_bar->IsClosing())
       last_bar = this_bar;
 
     this_bar = NULL;
   }
 
   if (last_bar)
     last_bar->ShowArrowFor(this_bar, animate);
@@ skipping 40 matching lines @@
 }
 
 void InfoBarContainerGtk::UpdateToolbarInfoBarState(
     InfoBar* infobar, bool animate) {
   GtkWindow* parent = platform_util::GetTopLevel(widget());
   BrowserWindowGtk* browser_window =
       BrowserWindowGtk::GetBrowserWindowForNativeWindow(parent);
   if (browser_window)
     browser_window->SetInfoBarShowing(infobar, animate);
 }