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

Unified Diff: ui/views/controls/menu/menu_item_view.cc

Issue 10832360: Change to address default selection of menu item (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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: ui/views/controls/menu/menu_item_view.cc
diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc
index f89648cd4d3a5f28e11378d5f9c62845d1ac6b48..f9fb3b6bf302229d5d69d012a2612e0f6292f8be 100644
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -89,6 +89,7 @@ MenuItemView::MenuItemView(MenuDelegate* delegate)
submenu_(NULL),
has_mnemonics_(false),
show_mnemonics_(false),
+ is_root_context_menu_(false),
has_icons_(false),
icon_view_(NULL),
top_margin_(-1),
@@ -624,7 +625,8 @@ void MenuItemView::Init(MenuItemView* parent,
SetEnabled(root_delegate->IsCommandEnabled(command));
}
-void MenuItemView::PrepareForRun(bool has_mnemonics, bool show_mnemonics) {
+void MenuItemView::PrepareForRun(bool has_mnemonics, bool show_mnemonics,
+ bool is_root_context_menu) {
// Currently we only support showing the root.
DCHECK(!parent_menu_item_);
@@ -635,6 +637,7 @@ void MenuItemView::PrepareForRun(bool has_mnemonics, bool show_mnemonics) {
has_mnemonics_ = has_mnemonics;
show_mnemonics_ = has_mnemonics && show_mnemonics;
+ is_root_context_menu_ = is_root_context_menu;
AddEmptyMenus();

Powered by Google App Engine
This is Rietveld 408576698