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

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

Issue 7720012: Moves ownership of MenuItemView to MenuRunner as well as responbility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test Created 9 years, 4 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/before_translate_infobar.cc
diff --git a/chrome/browser/ui/views/infobars/before_translate_infobar.cc b/chrome/browser/ui/views/infobars/before_translate_infobar.cc
index 9a0f66e8764a24c3b4d39b365df23e4fc2387f56..61a6b127dfcf0b93dad7ffaf18ec9cc66da4ea1c 100644
--- a/chrome/browser/ui/views/infobars/before_translate_infobar.cc
+++ b/chrome/browser/ui/views/infobars/before_translate_infobar.cc
@@ -12,6 +12,7 @@
#include "views/controls/label.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"
BeforeTranslateInfoBar::BeforeTranslateInfoBar(
@@ -197,8 +198,9 @@ void BeforeTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) {
}
views::MenuModelAdapter menu_model_adapter(menu_model);
- views::MenuItemView menu(&menu_model_adapter);
- menu_model_adapter.BuildMenu(&menu);
- menu.RunMenuAt(source->GetWidget(), NULL, gfx::Rect(pt, gfx::Size()),
- views::MenuItemView::TOPRIGHT, true);
+ views::MenuRunner menu_runner(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;
}

Powered by Google App Engine
This is Rietveld 408576698