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

Unified Diff: chrome/browser/chromeos/login/webui_login_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/chromeos/login/webui_login_view.cc
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 493000572dee644dc1f5ccc1b337705407aad25b..53a9cf949d6c8041d6df6eff551a1db81d183cbb 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -128,18 +128,23 @@ WebUILoginView::WebUILoginView()
content::NotificationService::AllSources());
accel_map_[ui::Accelerator(ui::VKEY_Z,
- ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
+ ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+ ui::ET_KEY_PRESSED)] =
kAccelNameAccessibility;
- accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)] =
+ accel_map_[ui::Accelerator(ui::VKEY_ESCAPE,
+ ui::EF_NONE,
+ ui::ET_KEY_PRESSED)] =
kAccelNameCancel;
accel_map_[ui::Accelerator(ui::VKEY_E,
- ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
+ ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+ ui::ET_KEY_PRESSED)] =
kAccelNameEnrollment;
// This should be kept in sync with the IDC_EXIT accelerator.
accel_map_[ui::Accelerator(ui::VKEY_Q,
- ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)] =
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+ ui::ET_KEY_PRESSED)] =
kAccelNameExit;
- accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] =
+ accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN, ui::ET_KEY_PRESSED)] =
kAccelNameVersion;
for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i)

Powered by Google App Engine
This is Rietveld 408576698