Index: chrome/browser/ui/views/infobars/extension_infobar.cc |
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc |
index 8372982d425500eea6adbb99f6ddc870cc69f94f..ad83e0f09955bd48b3b2c489fa7d8fa757b66717 100644 |
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc |
+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc |
@@ -19,6 +19,7 @@ |
#include "views/controls/button/menu_button.h" |
#include "views/controls/menu/menu_item_view.h" |
#include "views/controls/menu/menu_model_adapter.h" |
+#include "views/controls/menu/menu_runner.h" |
#include "views/widget/widget.h" |
// ExtensionInfoBarDelegate ---------------------------------------------------- |
@@ -148,14 +149,14 @@ void ExtensionInfoBar::RunMenu(View* source, const gfx::Point& pt) { |
scoped_refptr<ExtensionContextMenuModel> options_menu_contents = |
new ExtensionContextMenuModel(extension, browser, NULL); |
views::MenuModelAdapter options_menu_delegate(options_menu_contents.get()); |
- views::MenuItemView options_menu(&options_menu_delegate); |
- options_menu_delegate.BuildMenu(&options_menu); |
+ views::MenuRunner options_menu_runner(options_menu_delegate.CreateMenu()); |
gfx::Point screen_point; |
views::View::ConvertPointToScreen(menu_, &screen_point); |
- options_menu.RunMenuAt(GetWidget(), menu_, |
- gfx::Rect(screen_point, menu_->size()), views::MenuItemView::TOPLEFT, |
- true); |
+ if (options_menu_runner.RunMenuAt(GetWidget(), menu_, |
+ gfx::Rect(screen_point, menu_->size()), views::MenuItemView::TOPLEFT, |
+ views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED) |
+ return; |
} |
ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() { |