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

Unified Diff: chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

Issue 16979002: Add ContextMenuSourceType to views::ContextMenuController::ShowContextMenuForView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 7 years, 6 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/extensions/browser_action_overflow_menu_controller.cc
diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
index f87c7096a1cb232ec57bc2b819cc7aa7db9962b5..2551441801350cf020f2ba17ad398919896b242c 100644
--- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
+++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
@@ -76,7 +76,7 @@ bool BrowserActionOverflowMenuController::RunMenu(views::Widget* window,
views::MenuItemView::AnchorPosition anchor = views::MenuItemView::TOPRIGHT;
// As we maintain our own lifetime we can safely ignore the result.
ignore_result(menu_runner_->RunMenuAt(window, menu_button_, bounds, anchor,
- for_drop_ ? views::MenuRunner::FOR_DROP : 0));
+ ui::MENU_SOURCE_NONE, for_drop_ ? views::MenuRunner::FOR_DROP : 0));
if (!for_drop_) {
// Give the context menu (if any) a chance to execute the user-selected
// command.
@@ -103,7 +103,7 @@ bool BrowserActionOverflowMenuController::ShowContextMenu(
views::MenuItemView* source,
int id,
const gfx::Point& p,
- bool is_mouse_gesture) {
+ ui::MenuSourceType source_type) {
const extensions::Extension* extension =
(*views_)[start_index_ + id - 1]->button()->extension();
if (!extension->ShowConfigureContextMenus())
@@ -117,6 +117,7 @@ bool BrowserActionOverflowMenuController::ShowContextMenu(
// This blocks until the user choses something or dismisses the menu.
ignore_result(context_menu_runner.RunMenuAt(menu_button_->GetWidget(),
NULL, gfx::Rect(p, gfx::Size()), views::MenuItemView::TOPLEFT,
+ source_type,
views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::IS_NESTED |
views::MenuRunner::CONTEXT_MENU));

Powered by Google App Engine
This is Rietveld 408576698