ui: Remove TouchStatus in favour of EventResult.

BUG=none

Review URL: https://codereview.chromium.org/11364062

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165877 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 17 insertions, 68 deletions

diff --git a/ui/aura/event_filter.cc b/ui/aura/event_filter.cc
index d8c4f28..06201b1 100644
--- a/ui/aura/event_filter.cc
+++ b/ui/aura/event_filter.cc
@@ -17,9 +17,9 @@ bool EventFilter::PreHandleMouseEvent(Window* target, ui::MouseEvent* event) {
   return false;
 }
 
-ui::TouchStatus EventFilter::PreHandleTouchEvent(Window* target,
+ui::EventResult EventFilter::PreHandleTouchEvent(Window* target,
                                                  ui::TouchEvent* event) {
-  return ui::TOUCH_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 ui::EventResult EventFilter::PreHandleGestureEvent(Window* target,
@@ -42,9 +42,7 @@ ui::EventResult EventFilter::OnScrollEvent(ui::ScrollEvent* event) {
 }
 
 ui::EventResult EventFilter::OnTouchEvent(ui::TouchEvent* event) {
-  ui::TouchStatus status = PreHandleTouchEvent(
-      static_cast<Window*>(event->target()), event);
-  return ui::EventResultFromTouchStatus(status);
+  return PreHandleTouchEvent(static_cast<Window*>(event->target()), event);
 }
 
 ui::EventResult EventFilter::OnGestureEvent(ui::GestureEvent* event) {
diff --git a/ui/aura/event_filter.h b/ui/aura/event_filter.h
index 7af680b..8b02986 100644
--- a/ui/aura/event_filter.h
+++ b/ui/aura/event_filter.h
@@ -52,9 +52,9 @@ class AURA_EXPORT EventFilter : public ui::EventHandler {
   virtual bool PreHandleKeyEvent(Window* target, ui::KeyEvent* event);
   virtual bool PreHandleMouseEvent(Window* target, ui::MouseEvent* event);
 
-  // Returns a value other than ui::TOUCH_STATUS_UNKNOWN if the event is
+  // Returns a value other than ui::ER_UNHANDLED if the event is
   // consumed.
-  virtual ui::TouchStatus PreHandleTouchEvent(Window* target,
+  virtual ui::EventResult PreHandleTouchEvent(Window* target,
                                               ui::TouchEvent* event);
 
   // Returns a value other than ui::ER_UNHANDLED if the gesture is
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index af609ad..e8a5524 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -103,10 +103,10 @@ class EventCountFilter : public EventFilter {
     num_mouse_events_++;
     return true;
   }
-  virtual ui::TouchStatus PreHandleTouchEvent(
+  virtual ui::EventResult PreHandleTouchEvent(
       Window* target, ui::TouchEvent* event) OVERRIDE {
     num_touch_events_++;
-    return ui::TOUCH_STATUS_UNKNOWN;
+    return ui::ER_UNHANDLED;
   }
   virtual ui::EventResult PreHandleGestureEvent(
       Window* target, ui::GestureEvent* event) OVERRIDE {
@@ -459,11 +459,11 @@ class EventFilterRecorder : public EventFilter {
     events_.push_back(event->type());
     return true;
   }
-  virtual ui::TouchStatus PreHandleTouchEvent(
+  virtual ui::EventResult PreHandleTouchEvent(
       Window* target,
       ui::TouchEvent* event) OVERRIDE {
     events_.push_back(event->type());
-    return ui::TOUCH_STATUS_UNKNOWN;
+    return ui::ER_UNHANDLED;
   }
   virtual ui::EventResult PreHandleGestureEvent(
       Window* target,
diff --git a/ui/aura/shared/compound_event_filter_unittest.cc b/ui/aura/shared/compound_event_filter_unittest.cc
index c797700..e3f72f6 100644
--- a/ui/aura/shared/compound_event_filter_unittest.cc
+++ b/ui/aura/shared/compound_event_filter_unittest.cc
@@ -72,10 +72,10 @@ class ConsumeGestureEventFilter : public EventFilter {
     return false;
   }
 
-  virtual ui::TouchStatus PreHandleTouchEvent(
+  virtual ui::EventResult PreHandleTouchEvent(
       Window* target,
       ui::TouchEvent* event) OVERRIDE {
-    return ui::TOUCH_STATUS_UNKNOWN;
+    return ui::ER_UNHANDLED;
   }
 
   virtual ui::EventResult PreHandleGestureEvent(
diff --git a/ui/aura/shared/input_method_event_filter.cc b/ui/aura/shared/input_method_event_filter.cc
index 44e7a85..b7745e5 100644
--- a/ui/aura/shared/input_method_event_filter.cc
+++ b/ui/aura/shared/input_method_event_filter.cc
@@ -64,10 +64,10 @@ bool InputMethodEventFilter::PreHandleMouseEvent(aura::Window* target,
   return false;
 }
 
-ui::TouchStatus InputMethodEventFilter::PreHandleTouchEvent(
+ui::EventResult InputMethodEventFilter::PreHandleTouchEvent(
     aura::Window* target,
     ui::TouchEvent* event) {
-  return ui::TOUCH_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 ui::EventResult InputMethodEventFilter::PreHandleGestureEvent(
diff --git a/ui/aura/shared/input_method_event_filter.h b/ui/aura/shared/input_method_event_filter.h
index 90b0d3d..18d3d2a 100644
--- a/ui/aura/shared/input_method_event_filter.h
+++ b/ui/aura/shared/input_method_event_filter.h
@@ -39,7 +39,7 @@ class VIEWS_EXPORT InputMethodEventFilter
   virtual bool PreHandleKeyEvent(Window* target, ui::KeyEvent* event) OVERRIDE;
   virtual bool PreHandleMouseEvent(Window* target,
                                    ui::MouseEvent* event) OVERRIDE;
-  virtual ui::TouchStatus PreHandleTouchEvent(
+  virtual ui::EventResult PreHandleTouchEvent(
       Window* target,
       ui::TouchEvent* event) OVERRIDE;
   virtual ui::EventResult PreHandleGestureEvent(
diff --git a/ui/base/events/event_constants.cc b/ui/base/events/event_constants.cc
deleted file mode 100644
index e4c0b26..0000000
--- a/ui/base/events/event_constants.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-// 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/base/events/event_constants.h"
-
-#include "base/logging.h"
-
-namespace ui {
-
-EventResult EventResultFromTouchStatus(TouchStatus status) {
-  switch (status) {
-    case TOUCH_STATUS_UNKNOWN:
-      return ER_UNHANDLED;
-
-    case TOUCH_STATUS_START:
-    case TOUCH_STATUS_CONTINUE:
-    case TOUCH_STATUS_END:
-    case TOUCH_STATUS_QUEUED:
-    case TOUCH_STATUS_QUEUED_END:
-      return ER_CONSUMED;
-  }
-
-  NOTREACHED();
-  return ER_UNHANDLED;
-}
-
-}  // namespace ui
diff --git a/ui/base/events/event_constants.h b/ui/base/events/event_constants.h
index a18d507..8ee434f 100644
--- a/ui/base/events/event_constants.h
+++ b/ui/base/events/event_constants.h
@@ -116,26 +116,6 @@ enum EventPhase {
   EP_POSTDISPATCH
 };
 
-enum TouchStatus {
-  TOUCH_STATUS_UNKNOWN = 0,  // Unknown touch status. This is used to indicate
-                             // that the touch event was not handled.
-  TOUCH_STATUS_START,        // The touch event initiated a touch sequence.
-  TOUCH_STATUS_CONTINUE,     // The touch event is part of a previously
-                             // started touch sequence.
-  TOUCH_STATUS_END,          // The touch event ended the touch sequence.
-  TOUCH_STATUS_QUEUED,       // The touch event has not been processed yet, but
-                             // may be processed asynchronously later. This also
-                             // places a lock on touch-events (i.e. all
-                             // subsequent touch-events should be sent to the
-                             // current handler).
-  TOUCH_STATUS_QUEUED_END,   // Similar to TOUCH_STATUS_QUEUED, except that
-                             // subsequent touch-events can be sent to any
-                             // handler.
-};
-
-// Returns an equivalent EventResult from a TouchStatus.
-UI_EXPORT EventResult EventResultFromTouchStatus(TouchStatus status);
-
 // Updates the list of devices for cached properties.
 UI_EXPORT void UpdateDeviceList();
 
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 264de07..5f75a91 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -159,7 +159,6 @@
         'base/dragdrop/os_exchange_data_provider_win.h',
         'base/events/event.cc',
         'base/events/event.h',
-        'base/events/event_constants.cc',
         'base/events/event_constants.h',
         'base/events/event_dispatcher.cc',
         'base/events/event_dispatcher.h',
diff --git a/ui/views/widget/x11_window_event_filter.cc b/ui/views/widget/x11_window_event_filter.cc
index 83b2fc6..8f48b00 100644
--- a/ui/views/widget/x11_window_event_filter.cc
+++ b/ui/views/widget/x11_window_event_filter.cc
@@ -111,10 +111,10 @@ bool X11WindowEventFilter::PreHandleMouseEvent(aura::Window* target,
   return DispatchHostWindowDragMovement(component, root_location);
 }
 
-ui::TouchStatus X11WindowEventFilter::PreHandleTouchEvent(
+ui::EventResult X11WindowEventFilter::PreHandleTouchEvent(
     aura::Window* target,
     ui::TouchEvent* event) {
-  return ui::TOUCH_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 ui::EventResult X11WindowEventFilter::PreHandleGestureEvent(
diff --git a/ui/views/widget/x11_window_event_filter.h b/ui/views/widget/x11_window_event_filter.h
index 6b3aafe..9dd33ae2 100644
--- a/ui/views/widget/x11_window_event_filter.h
+++ b/ui/views/widget/x11_window_event_filter.h
@@ -40,7 +40,7 @@ class VIEWS_EXPORT X11WindowEventFilter : public aura::EventFilter {
                                  ui::KeyEvent* event) OVERRIDE;
   virtual bool PreHandleMouseEvent(aura::Window* target,
                                    ui::MouseEvent* event) OVERRIDE;
-  virtual ui::TouchStatus PreHandleTouchEvent(
+  virtual ui::EventResult PreHandleTouchEvent(
       aura::Window* target,
       ui::TouchEvent* event) OVERRIDE;
   virtual ui::EventResult PreHandleGestureEvent(