Index: ui/base/events/event_handler.cc |
diff --git a/ui/base/events/event_handler.cc b/ui/base/events/event_handler.cc |
index 85ec7d596623f9111d4cd69f5ff557eb49779f41..e36a01f24944918b85c9e2d838dbc336e4a63f8b 100644 |
--- a/ui/base/events/event_handler.cc |
+++ b/ui/base/events/event_handler.cc |
@@ -21,29 +21,22 @@ EventHandler::~EventHandler() { |
} |
void EventHandler::OnEvent(Event* event) { |
- ui::EventResult result = ui::ER_UNHANDLED; |
if (event->IsKeyEvent()) |
OnKeyEvent(static_cast<KeyEvent*>(event)); |
else if (event->IsMouseEvent()) |
- result = OnMouseEvent(static_cast<MouseEvent*>(event)); |
+ OnMouseEvent(static_cast<MouseEvent*>(event)); |
else if (event->IsScrollEvent()) |
OnScrollEvent(static_cast<ScrollEvent*>(event)); |
else if (event->IsTouchEvent()) |
OnTouchEvent(static_cast<TouchEvent*>(event)); |
else if (event->IsGestureEvent()) |
OnGestureEvent(static_cast<GestureEvent*>(event)); |
- |
- if (result & ui::ER_CONSUMED) |
- event->StopPropagation(); |
- if (result & ui::ER_HANDLED) |
- event->SetHandled(); |
} |
void EventHandler::OnKeyEvent(KeyEvent* event) { |
} |
-EventResult EventHandler::OnMouseEvent(MouseEvent* event) { |
- return ui::ER_UNHANDLED; |
+void EventHandler::OnMouseEvent(MouseEvent* event) { |
} |
void EventHandler::OnScrollEvent(ScrollEvent* event) { |