Make infobars ignore button clicks when closing.

chrome/browser/ui/views/infobars/after_translate_infobar.cc

 // Copyright (c) 2011 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/ui/views/infobars/after_translate_infobar.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 108 matching lines @@
 
   // These must happen after adding all children because they trigger layout,
   // which assumes that particular children (e.g. the close button) have already
   // been added.
   OriginalLanguageChanged();
   TargetLanguageChanged();
 }
 
 void AfterTranslateInfoBar::ButtonPressed(views::Button* sender,
                                           const views::Event& event) {
+  if (!owned())
+    return;  // We're closing; don't call anything, it might access the owner.
   if (sender == revert_button_)
     GetDelegate()->RevertTranslation();
   else
     TranslateInfoBarBase::ButtonPressed(sender, event);
 }
 
 int AfterTranslateInfoBar::ContentMinimumWidth() const {
   return
       (kButtonInLabelSpacing +
            original_language_menu_button_->GetPreferredSize().width() +
@@ skipping 17 matching lines @@
 void AfterTranslateInfoBar::TargetLanguageChanged() {
   // Tests can call this function when the infobar has never been added to a
   // view hierarchy and thus there is no button.
   if (target_language_menu_button_) {
     UpdateLanguageButtonText(target_language_menu_button_,
                              LanguagesMenuModel::TARGET);
   }
 }
 
 void AfterTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) {
+  if (!owned())
+    return;  // We're closing; don't call anything, it might access the owner.
   ui::MenuModel* menu_model = NULL;
   views::MenuButton* button = NULL;
   views::MenuItemView::AnchorPosition anchor = views::MenuItemView::TOPLEFT;
   if (source == original_language_menu_button_) {
     menu_model = &original_language_menu_model_;
     button = original_language_menu_button_;
   } else if (source == target_language_menu_button_) {
     menu_model = &target_language_menu_model_;
     button = target_language_menu_button_;
   } else {
     DCHECK_EQ(options_menu_button_, source);
     menu_model = &options_menu_model_;
     button = options_menu_button_;
     anchor = views::MenuItemView::TOPRIGHT;
   }
   RunMenuAt(menu_model, button, anchor);
-  // TODO(pkasting): this may be deleted after rewrite.
 }