events: Clean up dispatching code for touch-events.

ui/views/widget/desktop_native_widget_aura.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/views/widget/desktop_native_widget_aura.h"
 
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
@@ skipping 418 matching lines @@
 
     // Convert unprocessed scroll events into wheel events.
     ui::MouseWheelEvent mwe(*static_cast<ui::ScrollEvent*>(event));
     return native_widget_delegate_->OnMouseEvent(mwe) ?
         ui::ER_HANDLED : ui::ER_UNHANDLED;
   }
   return native_widget_delegate_->OnMouseEvent(*event) ?
       ui::ER_HANDLED : ui::ER_UNHANDLED;
 }
 
-ui::TouchStatus DesktopNativeWidgetAura::OnTouchEvent(ui::TouchEvent* event) {
-  return native_widget_delegate_->OnTouchEvent(*event);
+ui::EventResult DesktopNativeWidgetAura::OnTouchEvent(ui::TouchEvent* event) {
+  ui::TouchStatus status = native_widget_delegate_->OnTouchEvent(*event);
+  switch (status) {
+    case ui::TOUCH_STATUS_UNKNOWN:

[Ben Goodger (Google), 2012/09/26 19:42:48]

should you have a function in ui/base/events that has this switch statement?
i've seen it a couple of times in this cl.

[sadrul, 2012/09/26 21:26:05]

Done.

+      return ui::ER_UNHANDLED;
+
+    case ui::TOUCH_STATUS_START:
+    case ui::TOUCH_STATUS_CONTINUE:
+    case ui::TOUCH_STATUS_END:
+      return ui::ER_CONSUMED;
+
+    case ui::TOUCH_STATUS_QUEUED:
+    case ui::TOUCH_STATUS_QUEUED_END:
+      return ui::ER_ASYNC;
+  }
+
+  NOTREACHED();
+  return ui::ER_UNHANDLED;
 }
 
 ui::EventResult DesktopNativeWidgetAura::OnGestureEvent(
     ui::GestureEvent* event) {
   return native_widget_delegate_->OnGestureEvent(*event);
 }
 
 }  // namespace views