Make TabContents own its infobar delegates....

chrome/browser/ui/views/infobars/before_translate_infobar.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/views/infobars/before_translate_infobar.h"
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/options_menu_model.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
@@ skipping 15 matching lines @@
       l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_BEFORE_MESSAGE,
                                  string16(), &offset);
 
   label_1_ = CreateLabel(text.substr(0, offset));
   AddChildView(label_1_);
 
   label_2_ = CreateLabel(text.substr(offset));
   AddChildView(label_2_);
 
   accept_button_ =
-    InfoBarTextButton::CreateWithMessageID(this,
-                                           IDS_TRANSLATE_INFOBAR_ACCEPT);
+    InfoBarTextButton::CreateWithMessageID(this, IDS_TRANSLATE_INFOBAR_ACCEPT);
   AddChildView(accept_button_);
 
   deny_button_ =
-    InfoBarTextButton::CreateWithMessageID(this,
-                                           IDS_TRANSLATE_INFOBAR_DENY);
+    InfoBarTextButton::CreateWithMessageID(this, IDS_TRANSLATE_INFOBAR_DENY);
   AddChildView(deny_button_);
 
   language_menu_button_ = CreateMenuButton(string16(), true, this);
   AddChildView(language_menu_button_);
 
   options_menu_button_ =
       CreateMenuButton(l10n_util::GetStringUTF16(IDS_TRANSLATE_INFOBAR_OPTIONS),
                        false, this);
   AddChildView(options_menu_button_);
 
@@ skipping 64 matching lines @@
     DCHECK(!never_translate_button_);
     pref_size = always_translate_button_->GetPreferredSize();
     always_translate_button_->SetBounds(
           deny_button_->bounds().right() + InfoBar::kButtonButtonSpacing,
           OffsetY(this, pref_size), pref_size.width(), pref_size.height());
   }
 }
 
 void BeforeTranslateInfoBar::ButtonPressed(views::Button* sender,
                                            const views::Event& event) {
+  if (!delegate()) {
+    TranslateInfoBarBase::ButtonPressed(sender, event);
+    return;
+  }
+
+  TranslateInfoBarDelegate* delegate = GetDelegate();
   if (sender == accept_button_) {
-    GetDelegate()->Translate();
+    delegate->Translate();
   } else if (sender == deny_button_) {
+    delegate->TranslationDeclined();
     RemoveInfoBar();
-    GetDelegate()->TranslationDeclined();
   } else if (sender == never_translate_button_) {
-    GetDelegate()->NeverTranslatePageLanguage();
+    delegate->NeverTranslatePageLanguage();
   } else if (sender == always_translate_button_) {
-    GetDelegate()->AlwaysTranslatePageLanguage();
+    delegate->AlwaysTranslatePageLanguage();
   } else {
     TranslateInfoBarBase::ButtonPressed(sender, event);
   }
 }
 
 void BeforeTranslateInfoBar::OriginalLanguageChanged() {
   UpdateOriginalButtonText();
 }
 
 void BeforeTranslateInfoBar::TargetLanguageChanged() {
   NOTREACHED();
 }
 
 void BeforeTranslateInfoBar::RunMenu(views::View* source,
                                      const gfx::Point& pt) {
+  if (!delegate())
+    return;
+  // TODO(pkasting): What if the InfoBarDelegate is closed while the menu is
+  // open?  Then the menu models may deref garbage delegate pointers.
+
   if (source == language_menu_button_) {
     if (!languages_menu_.get())
       languages_menu_.reset(new views::Menu2(&languages_menu_model_));
     languages_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
   } else if (source == options_menu_button_) {
     if (!options_menu_.get())
       options_menu_.reset(new views::Menu2(&options_menu_model_));
     options_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
   } else {
     NOTREACHED();
   }
 }
 
 void BeforeTranslateInfoBar::UpdateOriginalButtonText() {
+  // TODO(pkasting): Can this be reached during closing?  If not we can
+  // DCHECK(delegate()) instead.
+  if (!delegate())
+    return;
+
   string16 language = GetDelegate()->GetLanguageDisplayableNameAt(
       GetDelegate()->original_language_index());
   language_menu_button_->SetText(UTF16ToWideHack(language));
   // The following line is necessary for the preferred size to be recomputed.
   language_menu_button_->ClearMaxTextSize();
   // The button may have to grow to show the new text.
   Layout();
   SchedulePaint();
 }