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

Unified Diff: ash/accelerators/accelerator_filter.cc

Issue 11570012: events: Update key-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-for-landing Created 8 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
« no previous file with comments | « ash/accelerators/accelerator_filter.h ('k') | ash/drag_drop/drag_drop_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_filter.cc
diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc
index 51c44505393e4333ca3eda16e7c8f432f7e15727..892beabff2627ce55335d2fa0cbc4a045e09eb6c 100644
--- a/ash/accelerators/accelerator_filter.cc
+++ b/ash/accelerators/accelerator_filter.cc
@@ -67,12 +67,12 @@ AcceleratorFilter::~AcceleratorFilter() {
////////////////////////////////////////////////////////////////////////////////
// AcceleratorFilter, EventFilter implementation:
-ui::EventResult AcceleratorFilter::OnKeyEvent(ui::KeyEvent* event) {
+void AcceleratorFilter::OnKeyEvent(ui::KeyEvent* event) {
const ui::EventType type = event->type();
if (type != ui::ET_KEY_PRESSED && type != ui::ET_KEY_RELEASED)
- return ui::ER_UNHANDLED;
+ return;
if (event->is_char())
- return ui::ER_UNHANDLED;
+ return;
ui::Accelerator accelerator(event->key_code(),
event->flags() & kModifierFlagMask);
@@ -85,9 +85,9 @@ ui::EventResult AcceleratorFilter::OnKeyEvent(ui::KeyEvent* event) {
aura::Window* target = static_cast<aura::Window*>(event->target());
if (!ShouldProcessAcceleratorsNow(accelerator, target))
- return ui::ER_UNHANDLED;
- return Shell::GetInstance()->accelerator_controller()->Process(accelerator) ?
- ui::ER_CONSUMED : ui::ER_UNHANDLED;
+ return;
+ if (Shell::GetInstance()->accelerator_controller()->Process(accelerator))
+ event->StopPropagation();
}
} // namespace internal
« no previous file with comments | « ash/accelerators/accelerator_filter.h ('k') | ash/drag_drop/drag_drop_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698