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

Unified Diff: ui/views/widget/desktop_native_widget_aura.cc

Issue 10964051: events: Clean up dispatching code for touch-events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months 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
Index: ui/views/widget/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_native_widget_aura.cc b/ui/views/widget/desktop_native_widget_aura.cc
index 7d36459b8757f53a79898c95cd7e831538040005..e3c38f42cb651abc2c3a5e233985f6ac08f44d7a 100644
--- a/ui/views/widget/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_native_widget_aura.cc
@@ -436,8 +436,24 @@ ui::EventResult DesktopNativeWidgetAura::OnMouseEvent(ui::MouseEvent* 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
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(

Powered by Google App Engine
This is Rietveld 408576698