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

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

Issue 4767001: Make TabContents own its infobar delegates.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 65711)
+++ chrome/browser/ui/views/infobars/after_translate_infobar.cc (working copy)
@@ -117,15 +117,21 @@
void AfterTranslateInfoBar::ButtonPressed(views::Button* sender,
const views::Event& event) {
- if (sender == revert_button_) {
+ if (delegate() && (sender == revert_button_)) {
GetDelegate()->RevertTranslation();
return;
}
+
TranslateInfoBarBase::ButtonPressed(sender, event);
}
void AfterTranslateInfoBar::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 == original_language_menu_button_) {
if (!original_language_menu_.get()) {
original_language_menu_.reset(

Powered by Google App Engine
This is Rietveld 408576698