Make TabContents own its infobar delegates....

chrome/browser/gtk/infobar_gtk.h

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef CHROME_BROWSER_GTK_INFOBAR_GTK_H_
 #define CHROME_BROWSER_GTK_INFOBAR_GTK_H_
 #pragma once
 
 #include "app/gtk_signal.h"
 #include "app/slide_animation.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/gtk/infobar_arrow_model.h"
 #include "chrome/browser/gtk/owned_widget_gtk.h"
 #include "chrome/browser/gtk/slide_animator_gtk.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "third_party/skia/include/core/SkPaint.h"
 
 class CustomDrawButton;
 class GtkThemeProvider;
 class InfoBarContainerGtk;
-class InfoBarDelegate;
 
 class InfoBar : public SlideAnimatorGtk::Delegate,
                 public NotificationObserver,
                 public InfoBarArrowModel::Observer {
  public:
   explicit InfoBar(InfoBarDelegate* delegate);
   virtual ~InfoBar();
 
   InfoBarDelegate* delegate() const { return delegate_; }
 
@@ skipping 97 matching lines @@
   InfoBarArrowModel arrow_model_;
 
   NotificationRegistrar registrar_;
 
  private:
   CHROMEGTK_CALLBACK_0(InfoBar, void, OnCloseButton);
   CHROMEGTK_CALLBACK_1(InfoBar, gboolean, OnBackgroundExpose, GdkEventExpose*);
 
   void UpdateBorderColor();
 
+  // We cache |delegate_->GetInfoBarType()| for use in OnBackgroundExpose()
+  // since that may be called when there's no longer a delegate (e.g. during
+  // AnimateClose()).
+  InfoBarDelegate::Type cached_infobar_type_;
+
   DISALLOW_COPY_AND_ASSIGN(InfoBar);
 };
 
 #endif  // CHROME_BROWSER_GTK_INFOBAR_GTK_H_