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*> Delegates;
+    Delegates* delegates = Details<Delegates>(details).ptr();

[Evan Stade, 2010/11/11 22:39:47]

nit: can you call it DelegatePair?

[Peter Kasting, 2010/11/11 22:47:58]

Good idea.  Changed typedef and variable names here and elsewhere in the patch.

 
     // By not animating the removal/addition, this appears to be a replace.
     RemoveInfoBar(delegates->first, false);
     AddInfoBar(delegates->second, false);
   } else {
     NOTREACHED();
   }
 }
 
 // InfoBarContainerGtk, private: -----------------------------------------------
@@ skipping 72 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);
 }