Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1157)

Unified Diff: chrome/browser/ui/views/infobars/after_translate_infobar.cc

Issue 7981045: Make infobars ignore button clicks when closing. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/infobars/after_translate_infobar.cc
===================================================================
--- chrome/browser/ui/views/infobars/after_translate_infobar.cc (revision 103307)
+++ chrome/browser/ui/views/infobars/after_translate_infobar.cc (working copy)
@@ -126,6 +126,8 @@
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
@@ -163,6 +165,8 @@
}
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;
@@ -179,5 +183,4 @@
anchor = views::MenuItemView::TOPRIGHT;
}
RunMenuAt(menu_model, button, anchor);
- // TODO(pkasting): this may be deleted after rewrite.
}

Powered by Google App Engine
This is Rietveld 408576698