| Index: ui/base/events/event_target.cc
|
| diff --git a/ui/base/events/event_target.cc b/ui/base/events/event_target.cc
|
| index a7d93ddb1492f020ffdd65f880a3e612daff581b..c587877160a0fd69e3d4db772c34f5018c9b8720 100644
|
| --- a/ui/base/events/event_target.cc
|
| +++ b/ui/base/events/event_target.cc
|
| @@ -62,15 +62,16 @@ EventResult EventTarget::OnMouseEvent(MouseEvent* event) {
|
| return target_handler_ ? target_handler_->OnMouseEvent(event) : ER_UNHANDLED;
|
| }
|
|
|
| -EventResult EventTarget::OnScrollEvent(ScrollEvent* event) {
|
| +void EventTarget::OnScrollEvent(ScrollEvent* event) {
|
| CHECK_EQ(this, event->target());
|
| - return target_handler_ ? target_handler_->OnScrollEvent(event) : ER_UNHANDLED;
|
| + if (target_handler_)
|
| + target_handler_->OnScrollEvent(event);
|
| }
|
|
|
| -EventResult EventTarget::OnTouchEvent(TouchEvent* event) {
|
| +void EventTarget::OnTouchEvent(TouchEvent* event) {
|
| CHECK_EQ(this, event->target());
|
| - return target_handler_ ? target_handler_->OnTouchEvent(event) :
|
| - ER_UNHANDLED;
|
| + if (target_handler_)
|
| + target_handler_->OnTouchEvent(event);
|
| }
|
|
|
| void EventTarget::OnGestureEvent(GestureEvent* event) {
|
|
|