events: Clean up dispatching code for touch-events.

ui/aura/event_filter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/event_filter.h"
 
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 
 namespace aura {
@@ skipping 23 matching lines @@
 
 ui::EventResult EventFilter::OnMouseEvent(ui::MouseEvent* event) {
   return PreHandleMouseEvent(static_cast<Window*>(event->target()), event) ?
       ui::ER_CONSUMED : ui::ER_UNHANDLED;
 }
 
 ui::EventResult EventFilter::OnScrollEvent(ui::ScrollEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
-ui::TouchStatus EventFilter::OnTouchEvent(ui::TouchEvent* event) {
-  return PreHandleTouchEvent(static_cast<Window*>(event->target()), event);
+ui::EventResult EventFilter::OnTouchEvent(ui::TouchEvent* event) {
+  ui::TouchStatus status = PreHandleTouchEvent(
+      static_cast<Window*>(event->target()), event);
+  return ui::EventResultFromTouchStatus(status);
 }
 
 ui::EventResult EventFilter::OnGestureEvent(ui::GestureEvent* event) {
   return PreHandleGestureEvent(static_cast<Window*>(event->target()), event);
 }
 
 }  // namespace aura