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

Unified Diff: ui/base/accelerators/accelerator_manager.cc

Issue 10155015: Process all global shortcuts for Ash after InputMethodEventFilter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 8 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
« ash/accelerators/accelerator_table.cc ('K') | « ash/shell.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/accelerators/accelerator_manager.cc
diff --git a/ui/base/accelerators/accelerator_manager.cc b/ui/base/accelerators/accelerator_manager.cc
index 034593dfd0adad4809e046d0e0c4804930c5b8e0..4ab14b5fc15595789979a48f78fc7581dbd2563b 100644
--- a/ui/base/accelerators/accelerator_manager.cc
+++ b/ui/base/accelerators/accelerator_manager.cc
@@ -119,18 +119,13 @@ bool AcceleratorManager::HasPriorityHandler(
}
bool AcceleratorManager::ShouldHandle(const Accelerator& accelerator) const {
- if (accelerator.type() != ET_KEY_RELEASED &&
- accelerator.type() != ET_TRANSLATED_KEY_RELEASE) {
+ if (accelerator.type() != ET_KEY_RELEASED)
return true;
- }
+
// This check is necessary e.g. not to process the Shift+Alt+ET_KEY_RELEASED
// Accelerator for Chrome OS (see ash/accelerators/accelerator_controller.cc)
// when Shift+Alt+Tab is pressed and then Tab is released.
- if (last_event_type_ == ET_KEY_PRESSED ||
- last_event_type_ == ET_TRANSLATED_KEY_PRESS) {
- return true;
- }
- return false;
+ return last_event_type_ == ET_KEY_PRESSED;
}
} // namespace ui
« ash/accelerators/accelerator_table.cc ('K') | « ash/shell.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698