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

Unified Diff: chrome/browser/ui/views/toolbar_view.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
Index: chrome/browser/ui/views/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index b24f07004ba3db70d5397c196abacbefd0d72f5c..7e498e3bf24cbef47dd43e9aaf09e98b919e43bc 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -492,24 +492,33 @@ bool ToolbarView::GetAcceleratorForCommandId(int command_id,
// TODO(cpu) Bug 1109102. Query WebKit land for the actual bindings.
switch (command_id) {
case IDC_CUT:
- *accelerator = ui::Accelerator(ui::VKEY_X, ui::EF_CONTROL_DOWN);
+ *accelerator = ui::Accelerator(ui::VKEY_X,
+ ui::EF_CONTROL_DOWN,
+ ui::ET_KEY_PRESSED);
return true;
case IDC_COPY:
- *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN);
+ *accelerator = ui::Accelerator(ui::VKEY_C,
+ ui::EF_CONTROL_DOWN,
+ ui::ET_KEY_PRESSED);
return true;
case IDC_PASTE:
- *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN);
+ *accelerator = ui::Accelerator(ui::VKEY_V,
+ ui::EF_CONTROL_DOWN,
+ ui::ET_KEY_PRESSED);
return true;
#if defined(USE_ASH)
// When USE_ASH is defined, IDC_NEW_WINDOW and IDC_NEW_INCOGNITO_WINDOW are
// handled outside Chrome, in ash/accelerators/accelerator_table.cc.
// crbug.com/120196
case IDC_NEW_WINDOW:
- *accelerator = ui::Accelerator(ui::VKEY_N, ui::EF_CONTROL_DOWN);
+ *accelerator = ui::Accelerator(ui::VKEY_N,
+ ui::EF_CONTROL_DOWN,
+ ui::ET_KEY_PRESSED);
return true;
case IDC_NEW_INCOGNITO_WINDOW:
*accelerator = ui::Accelerator(ui::VKEY_N,
- ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+ ui::ET_KEY_PRESSED);
return true;
#endif
}
« no previous file with comments | « chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc ('k') | chrome/browser/ui/views/web_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698