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

Unified Diff: chrome/browser/ui/views/keyboard_overlay_dialog_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/keyboard_overlay_dialog_view.cc
diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
index 4774b4c5610f37e1f9b7477a764c9cfb6ff32c4c..0d65ed888262e9d49a5001a14a7bb22150bfb804 100644
--- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
+++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
@@ -46,16 +46,19 @@ KeyboardOverlayDialogView::~KeyboardOverlayDialogView() {
void KeyboardOverlayDialogView::RegisterDialogAccelerators() {
for (size_t i = 0; i < arraysize(kCloseAccelerators); ++i) {
ui::Accelerator accelerator(kCloseAccelerators[i].keycode,
- kCloseAccelerators[i].modifiers);
+ kCloseAccelerators[i].modifiers,
+ ui::ET_KEY_PRESSED);
close_accelerators_.insert(accelerator);
AddAccelerator(accelerator);
}
for (size_t i = 0; i < browser::kAcceleratorMapLength; ++i) {
ui::Accelerator accelerator(browser::kAcceleratorMap[i].keycode,
- browser::kAcceleratorMap[i].modifiers);
+ browser::kAcceleratorMap[i].modifiers,
+ ui::ET_KEY_PRESSED);
// Skip a sole ALT key since it's handled on the keyboard overlay.
- if (ui::Accelerator(ui::VKEY_MENU, ui::EF_NONE) == accelerator) {
+ if (ui::Accelerator(ui::VKEY_MENU, ui::EF_NONE, ui::ET_KEY_PRESSED)
+ == accelerator) {
continue;
}
// Skip accelerators for closing the dialog since they are already added.

Powered by Google App Engine
This is Rietveld 408576698