Index: ui/base/events/event_constants.h |
diff --git a/ui/base/events/event_constants.h b/ui/base/events/event_constants.h |
index 6785633f7782ae5ca5515b4f88121a4bd277ec09..bd966eafb0e759105fafea173558f750a3c2232e 100644 |
--- a/ui/base/events/event_constants.h |
+++ b/ui/base/events/event_constants.h |
@@ -98,12 +98,14 @@ enum MouseEventFlags { |
// Result of dispatching an event. |
enum EventResult { |
- ER_UNHANDLED = 0, // The event hasn't been handled. The event can be |
- // propagated to other handlers. |
- ER_HANDLED, // The event has already been handled, but it can still be |
- // propagated to other handlers. |
- ER_CONSUMED, // The event has been handled, and it should not be |
- // propagated to other handlers. |
+ ER_UNHANDLED = 0, // The event hasn't been handled. The event can be |
+ // propagated to other handlers. |
+ ER_HANDLED = 1 << 0, // The event has already been handled, but it can |
+ // still be propagated to other handlers. |
+ ER_CONSUMED = 1 << 1, // The event has been handled, and it should not be |
+ // propagated to other handlers. |
+ ER_ASYNC = 1 << 2, // The event will be processed asynchronously. The |
+ // event can still be propagated to other handlers. |
}; |
// Phase of the event dispatch. |
@@ -122,9 +124,6 @@ enum TouchStatus { |
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_SYNTH_MOUSE, // The touch event was not processed, but a |
- // synthetic mouse event generated from the |
- // unused touch event was handled. |
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 |
@@ -135,6 +134,9 @@ enum TouchStatus { |
// 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(); |