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

Unified Diff: ui/aura_shell/shell_accelerator_filter.cc

Issue 8833012: Fix the issue of ShellAcceleratorFilter sending accelerators twice for character keys. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add an unittest entry Created 9 years 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/aura_shell/shell_accelerator_filter.cc
diff --git a/ui/aura_shell/shell_accelerator_filter.cc b/ui/aura_shell/shell_accelerator_filter.cc
index d64a02f87c64d9d629e03e551f06369ae07e6808..1a971220b406af726df2c2986ed528abb5e0a5a1 100644
--- a/ui/aura_shell/shell_accelerator_filter.cc
+++ b/ui/aura_shell/shell_accelerator_filter.cc
@@ -35,11 +35,10 @@ ShellAcceleratorFilter::~ShellAcceleratorFilter() {
bool ShellAcceleratorFilter::PreHandleKeyEvent(aura::Window* target,
aura::KeyEvent* event) {
- if (event->type() == ui::ET_KEY_PRESSED &&
- Shell::GetInstance()->accelerator_controller()->Process(
- ui::Accelerator(event->key_code(),
- event->flags() & kModifierFlagMask))) {
- return true;
+ if (event->type() == ui::ET_KEY_PRESSED && !event->is_char()) {
+ return Shell::GetInstance()->accelerator_controller()->Process(
+ ui::Accelerator(event->key_code(),
+ event->flags() & kModifierFlagMask));
}
return false;
}

Powered by Google App Engine
This is Rietveld 408576698