Commit a6dd01f1 authored by sky@chromium.org's avatar sky@chromium.org

Speculative fix for 93314. I suspect the

OptionMenuModel::translate_infobar_delegate_ has been deleted. This
may be possible if BeforeTranslateInfoBar is deleted while the menu is
showing. Changing the code like I'm doing makes sure the menu is
deleted if BeforeTranslateInfoBar is deleted too.

BUG=93314
TEST=none
R=pkasting@chromium.org

Review URL: http://codereview.chromium.org/7745057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98693 0039d316-1c4b-4281-b951-d872f2087c98
parent 0e325586
......@@ -198,8 +198,8 @@ void BeforeTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) {
}
views::MenuModelAdapter menu_model_adapter(menu_model);
views::MenuRunner menu_runner(menu_model_adapter.CreateMenu());
if (menu_runner.RunMenuAt(source->GetWidget(), NULL,
menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu()));
if (menu_runner_->RunMenuAt(source->GetWidget(), NULL,
gfx::Rect(pt, gfx::Size()), views::MenuItemView::TOPRIGHT,
views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED)
return;
......
......@@ -14,6 +14,7 @@
class TranslateInfoBarDelegate;
namespace views {
class MenuButton;
class MenuRunner;
}
class BeforeTranslateInfoBar : public TranslateInfoBarBase,
......@@ -52,6 +53,8 @@ class BeforeTranslateInfoBar : public TranslateInfoBarBase,
LanguagesMenuModel languages_menu_model_;
OptionsMenuModel options_menu_model_;
scoped_ptr<views::MenuRunner> menu_runner_;
DISALLOW_COPY_AND_ASSIGN(BeforeTranslateInfoBar);
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment