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

Unified Diff: ash/wm/overlay_event_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/wm/overlay_event_filter.h ('k') | ash/wm/system_modal_container_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overlay_event_filter.cc
diff --git a/ash/wm/overlay_event_filter.cc b/ash/wm/overlay_event_filter.cc
index 1a333b7bb330a982ec9d74c4a10e80ff0c00695b..2319d2fca27b6ddc07e3d0d36ed7db70e7080da5 100644
--- a/ash/wm/overlay_event_filter.cc
+++ b/ash/wm/overlay_event_filter.cc
@@ -21,9 +21,9 @@ OverlayEventFilter::~OverlayEventFilter() {
delegate_ = NULL;
}
-ui::EventResult OverlayEventFilter::OnKeyEvent(ui::KeyEvent* event) {
+void OverlayEventFilter::OnKeyEvent(ui::KeyEvent* event) {
if (!delegate_)
- return ui::ER_UNHANDLED;
+ return;
// Do not consume a translated key event which is generated by an IME (e.g.,
// ui::VKEY_PROCESSKEY) since the key event is generated in response to a key
@@ -31,7 +31,7 @@ ui::EventResult OverlayEventFilter::OnKeyEvent(ui::KeyEvent* event) {
// confuse key event handling JavaScript code in a page.
if (event->type() == ui::ET_TRANSLATED_KEY_PRESS ||
event->type() == ui::ET_TRANSLATED_KEY_RELEASE) {
- return ui::ER_UNHANDLED;
+ return;
}
if (delegate_ && delegate_->IsCancelingKeyEvent(event))
@@ -46,7 +46,7 @@ ui::EventResult OverlayEventFilter::OnKeyEvent(ui::KeyEvent* event) {
// Always handled: other windows shouldn't receive input while we're
// displaying an overlay.
- return ui::ER_CONSUMED;
+ event->StopPropagation();
}
void OverlayEventFilter::OnLoginStateChanged(
« no previous file with comments | « ash/wm/overlay_event_filter.h ('k') | ash/wm/system_modal_container_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698