Make TabContents own its infobar delegates....

chrome/browser/gtk/translate/translate_infobar_base_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/translate/translate_infobar_base_gtk.h"
 
 #include "app/l10n_util.h"
 #include "app/slide_animation.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/options_menu_model.h"
@@ skipping 161 matching lines @@
   if (!gtk_combo_box_get_active_iter(combo, &iter))
     return 0;
 
   gint id = 0;
   gtk_tree_model_get(gtk_combo_box_get_model(combo), &iter,
                      LANGUAGE_COMBO_COLUMN_ID, &id,
                      -1);
   return id;
 }
 
-TranslateInfoBarDelegate* TranslateInfoBarBase::GetDelegate() const {
-  return static_cast<TranslateInfoBarDelegate*>(delegate());
-}
-
 // static
 GtkWidget* TranslateInfoBarBase::BuildOptionsMenuButton() {
   GtkWidget* button = gtk_button_new();
   GtkWidget* former_child = gtk_bin_get_child(GTK_BIN(button));
   if (former_child)
     gtk_container_remove(GTK_CONTAINER(button), former_child);
 
   GtkWidget* hbox = gtk_hbox_new(FALSE, 0);
 
   GtkWidget* label = gtk_label_new(
       l10n_util::GetStringUTF8(IDS_TRANSLATE_INFOBAR_OPTIONS).c_str());
   gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
   GtkWidget* arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
   gtk_box_pack_start(GTK_BOX(hbox), arrow, FALSE, FALSE, 0);
 
   gtk_container_add(GTK_CONTAINER(button), hbox);
 
   return button;
 }
 
 void TranslateInfoBarBase::OnOptionsClicked(GtkWidget* sender) {
+  if (!delegate())
+    return;
   if (!options_menu_model_.get()) {
     options_menu_model_.reset(new OptionsMenuModel(GetDelegate()));
     options_menu_menu_.reset(new MenuGtk(NULL, options_menu_model_.get()));
   }
   options_menu_menu_->Popup(sender, 1, gtk_get_current_event_time());
 }
 
 // TranslateInfoBarDelegate specific method:
 InfoBar* TranslateInfoBarDelegate::CreateInfoBar() {
   TranslateInfoBarBase* infobar = NULL;
@@ skipping 10 matching lines @@
       break;
     default:
       NOTREACHED();
   }
   infobar->Init();
   // Set |infobar_view_| so that the model can notify the infobar when it
   // changes.
   infobar_view_ = infobar;
   return infobar;
 }