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

Unified Diff: ash/wm/event_rewriter_event_filter.cc

Issue 11592011: events: Update mouse-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/event_rewriter_event_filter.h ('k') | ash/wm/panel_window_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/event_rewriter_event_filter.cc
diff --git a/ash/wm/event_rewriter_event_filter.cc b/ash/wm/event_rewriter_event_filter.cc
index 81ed7e58853b49668268b7ceb62c7800f95759d4..3b96c2ddf2da307aa822e04322c952ac0c960ef6 100644
--- a/ash/wm/event_rewriter_event_filter.cc
+++ b/ash/wm/event_rewriter_event_filter.cc
@@ -39,19 +39,17 @@ void EventRewriterEventFilter::OnKeyEvent(ui::KeyEvent* event) {
}
}
-ui::EventResult EventRewriterEventFilter::OnMouseEvent(ui::MouseEvent* event) {
+void EventRewriterEventFilter::OnMouseEvent(ui::MouseEvent* event) {
if (!delegate_.get())
- return ui::ER_UNHANDLED;
+ return;
switch (delegate_->RewriteOrFilterLocatedEvent(event)) {
case EventRewriterDelegate::ACTION_REWRITE_EVENT:
- return ui::ER_UNHANDLED;
+ return;
case EventRewriterDelegate::ACTION_DROP_EVENT:
- return ui::ER_CONSUMED;
+ event->StopPropagation();
+ break;
}
-
- NOTREACHED();
- return ui::ER_UNHANDLED;
}
} // namespace internal
« no previous file with comments | « ash/wm/event_rewriter_event_filter.h ('k') | ash/wm/panel_window_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698