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

Unified Diff: ui/base/events/event_handler.cc

Issue 11308322: events: Start changing EventHandler interface to not return a value. (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 | « ui/base/events/event_handler.h ('k') | ui/views/corewm/activation_change_shim.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/events/event_handler.cc
diff --git a/ui/base/events/event_handler.cc b/ui/base/events/event_handler.cc
index ea9048e409de0e8e2b52f9cb550f574b774755be..d6fcea771d4972dd4e0e4eafe8adbe7849bf2bba 100644
--- a/ui/base/events/event_handler.cc
+++ b/ui/base/events/event_handler.cc
@@ -14,18 +14,23 @@ EventHandler::EventHandler() {
EventHandler::~EventHandler() {
}
-EventResult EventHandler::OnEvent(Event* event) {
+void EventHandler::OnEvent(Event* event) {
+ ui::EventResult result = ui::ER_UNHANDLED;
if (event->IsKeyEvent())
- return OnKeyEvent(static_cast<KeyEvent*>(event));
- if (event->IsMouseEvent())
- return OnMouseEvent(static_cast<MouseEvent*>(event));
- if (event->IsScrollEvent())
- return OnScrollEvent(static_cast<ScrollEvent*>(event));
- if (event->IsTouchEvent())
- return OnTouchEvent(static_cast<TouchEvent*>(event));
- if (event->IsGestureEvent())
- return OnGestureEvent(static_cast<GestureEvent*>(event));
- return ui::ER_UNHANDLED;
+ result = OnKeyEvent(static_cast<KeyEvent*>(event));
+ else if (event->IsMouseEvent())
+ result = OnMouseEvent(static_cast<MouseEvent*>(event));
+ else if (event->IsScrollEvent())
+ result = OnScrollEvent(static_cast<ScrollEvent*>(event));
+ else if (event->IsTouchEvent())
+ result = OnTouchEvent(static_cast<TouchEvent*>(event));
+ else if (event->IsGestureEvent())
+ result = OnGestureEvent(static_cast<GestureEvent*>(event));
+
+ if (result & ui::ER_CONSUMED)
+ event->StopPropagation();
+ if (result & ui::ER_HANDLED)
+ event->SetHandled();
}
EventResult EventHandler::OnKeyEvent(KeyEvent* event) {
« no previous file with comments | « ui/base/events/event_handler.h ('k') | ui/views/corewm/activation_change_shim.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698