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

Unified Diff: chrome/browser/ui/views/wrench_menu.cc

Issue 10446010: wip: Add ui::EventType parameter. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wip - views_unittests Created 8 years, 7 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
« no previous file with comments | « chrome/browser/ui/views/web_dialog_view.cc ('k') | chrome/common/extensions/command.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/wrench_menu.cc
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index b624a334af650f9b657dc261db61d361f1a331da..825e364ddb52e6c08944d72e87714ec5c1458803 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -293,9 +293,9 @@ string16 GetAccessibleNameForWrenchMenuItem(
ui::Accelerator menu_accelerator;
if (model->GetAcceleratorAt(item_index, &menu_accelerator)) {
- accelerator_text =
- ui::Accelerator(menu_accelerator.key_code(),
- menu_accelerator.modifiers()).GetShortcutText();
+ accelerator_text = ui::Accelerator(menu_accelerator.key_code(),
+ menu_accelerator.modifiers(),
+ ui::ET_KEY_PRESSED).GetShortcutText();
}
return MenuItemView::GetAccessibleNameForMenuItem(
@@ -814,7 +814,8 @@ bool WrenchMenu::GetAccelerator(int id, ui::Accelerator* accelerator) {
return false;
*accelerator = ui::Accelerator(menu_accelerator.key_code(),
- menu_accelerator.modifiers());
+ menu_accelerator.modifiers(),
+ ui::ET_KEY_PRESSED);
return true;
}
« no previous file with comments | « chrome/browser/ui/views/web_dialog_view.cc ('k') | chrome/common/extensions/command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698