Make TabContents own its infobar delegates....

chrome/browser/gtk/infobar_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_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
@@ skipping 22 matching lines @@
 // Extra padding on either end of info bar.
 const int kLeftPadding = 5;
 const int kRightPadding = 5;
 
 }  // namespace
 
 InfoBar::InfoBar(InfoBarDelegate* delegate)
     : container_(NULL),
       delegate_(delegate),
       theme_provider_(NULL),
-      arrow_model_(this) {
+      arrow_model_(this),
+      cached_infobar_type_(delegate->GetInfoBarType()) {
   // Create |hbox_| and pad the sides.
   hbox_ = gtk_hbox_new(FALSE, kElementPadding);
 
   // Make the whole infor bar horizontally shrinkable.
   gtk_widget_set_size_request(hbox_, 0, -1);
 
   GtkWidget* padding = gtk_alignment_new(0, 0, 1, 1);
   gtk_alignment_set_padding(GTK_ALIGNMENT(padding),
       0, 0, kLeftPadding, kRightPadding);
 
@@ skipping 44 matching lines @@
 
 void InfoBar::Open() {
   slide_widget_->OpenWithoutAnimation();
 
   gtk_widget_show_all(bg_box_);
   if (bg_box_->window)
     gdk_window_lower(bg_box_->window);
 }
 
 void InfoBar::AnimateClose() {
+  delegate_ = NULL;
   slide_widget_->Close();
 }
 
 void InfoBar::Close() {
-  if (delegate_) {
-    delegate_->InfoBarClosed();
-    delegate_ = NULL;
-  }
+  delegate_ = NULL;
   delete this;
 }
 
 bool InfoBar::IsAnimating() {
   return slide_widget_->IsAnimating();
 }
 
 bool InfoBar::IsClosing() {
   return slide_widget_->IsClosing();
 }
@@ skipping 143 matching lines @@
       *b = 231.0 / 255.0;
       break;
   }
 }
 
 void InfoBar::UpdateBorderColor() {
   gtk_widget_queue_draw(widget());
 }
 
 void InfoBar::OnCloseButton(GtkWidget* button) {
-  if (delegate_)
+  if (delegate_) {
     delegate_->InfoBarDismissed();
-  RemoveInfoBar();
+    RemoveInfoBar();
+  }
 }
 
 gboolean InfoBar::OnBackgroundExpose(GtkWidget* sender,
                                      GdkEventExpose* event) {
   const int height = sender->allocation.height;
 
   cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(sender->window));
   gdk_cairo_rectangle(cr, &event->area);
   cairo_clip(cr);
 
   cairo_pattern_t* pattern = cairo_pattern_create_linear(0, 0, 0, height);
 
   double top_r, top_g, top_b;
-  GetTopColor(delegate_->GetInfoBarType(), &top_r, &top_g, &top_b);
+  GetTopColor(cached_infobar_type_, &top_r, &top_g, &top_b);
   cairo_pattern_add_color_stop_rgb(pattern, 0.0, top_r, top_g, top_b);
 
   double bottom_r, bottom_g, bottom_b;
   GetBottomColor(delegate_->GetInfoBarType(), &bottom_r, &bottom_g, &bottom_b);
   cairo_pattern_add_color_stop_rgb(
       pattern, 1.0, bottom_r, bottom_g, bottom_b);
   cairo_set_source(cr, pattern);
   cairo_paint(cr);
   cairo_pattern_destroy(pattern);
 
@@ skipping 42 matching lines @@
       : InfoBar(delegate) {
     size_t link_offset;
     string16 display_text = delegate->GetMessageTextWithOffset(&link_offset);
     string16 link_text = delegate->GetLinkText();
     AddLabelWithInlineLink(display_text, link_text, link_offset,
                            G_CALLBACK(OnLinkClick));
   }
 
  private:
   static void OnLinkClick(GtkWidget* button, LinkInfoBar* link_info_bar) {
-    if (link_info_bar->delegate_->AsLinkInfoBarDelegate()->
-        LinkClicked(gtk_util::DispositionForCurrentButtonPressEvent())) {

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

I understand that leaving off the {} in this case is not "wrong" according to
the style guide, but I'd appreciate it if you refrained changing this from one
not-wrong style to another not-wrong style to suit your personal preference.

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

Sorry!  Reverted here and below.

+    if (link_info_bar->delegate_ &&
+        link_info_bar->delegate_->AsLinkInfoBarDelegate()->
+            LinkClicked(gtk_util::DispositionForCurrentButtonPressEvent()))
       link_info_bar->RemoveInfoBar();
-    }
   }
 };
 
 // ConfirmInfoBar --------------------------------------------------------------
 
 class ConfirmInfoBar : public InfoBar {
  public:
   explicit ConfirmInfoBar(ConfirmInfoBarDelegate* delegate);
 
  private:
@@ skipping 47 matching lines @@
     gtk_util::CenterWidgetInHBox(confirm_hbox_, button, false,
                                  kButtonButtonSpacing);
     g_signal_connect(button, "clicked",
                      G_CALLBACK(type == ConfirmInfoBarDelegate::BUTTON_OK ?
                                 OnOkButtonThunk : OnCancelButtonThunk),
                      this);
   }
 }
 
 void ConfirmInfoBar::OnCancelButton(GtkWidget* widget) {
-  if (delegate_->AsConfirmInfoBarDelegate()->Cancel())
+  if (delegate_ && delegate_->AsConfirmInfoBarDelegate()->Cancel())
     RemoveInfoBar();
 }
 
 void ConfirmInfoBar::OnOkButton(GtkWidget* widget) {
-  if (delegate_->AsConfirmInfoBarDelegate()->Accept())
+  if (delegate_ && delegate_->AsConfirmInfoBarDelegate()->Accept())
     RemoveInfoBar();
 }
 
 void ConfirmInfoBar::OnLinkClicked(GtkWidget* widget) {
-  if (delegate_->AsConfirmInfoBarDelegate()->LinkClicked(
-          gtk_util::DispositionForCurrentButtonPressEvent())) {
+  if (delegate_ && delegate_->AsConfirmInfoBarDelegate()->LinkClicked(
+      gtk_util::DispositionForCurrentButtonPressEvent()))
     RemoveInfoBar();
-  }
 }
 
 InfoBar* AlertInfoBarDelegate::CreateInfoBar() {
   return new AlertInfoBar(this);
 }
 InfoBar* LinkInfoBarDelegate::CreateInfoBar() {
   return new LinkInfoBar(this);
 }
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
   return new ConfirmInfoBar(this);
 }