Sync ui/events to chromium @ https://codereview.chromium.org/1210203002

ui/events/event_constants.h

Index: ui/events/event_constants.h
diff --git a/ui/events/event_constants.h b/ui/events/event_constants.h
index c3677ada7ada3b1294c8071dd94f1a93ebb4148d..44589ab7a2d22c9215111f4b6de04ce46442f1a9 100644
--- a/ui/events/event_constants.h
+++ b/ui/events/event_constants.h
@@ -25,8 +25,6 @@ enum EventType {
   ET_TOUCH_MOVED,
   ET_TOUCH_CANCELLED,
   ET_DROP_TARGET_EVENT,
-  ET_TRANSLATED_KEY_PRESS,
-  ET_TRANSLATED_KEY_RELEASE,
 
   // GestureEvent types
   ET_GESTURE_SCROLL_BEGIN,
@@ -77,32 +75,34 @@ enum EventType {
 
 // Event flags currently supported
 enum EventFlags {
-  EF_NONE                = 0,       // Used to denote no flags explicitly
-  EF_CAPS_LOCK_DOWN      = 1 << 0,
-  EF_SHIFT_DOWN          = 1 << 1,
-  EF_CONTROL_DOWN        = 1 << 2,
-  EF_ALT_DOWN            = 1 << 3,
-  EF_LEFT_MOUSE_BUTTON   = 1 << 4,
-  EF_MIDDLE_MOUSE_BUTTON = 1 << 5,
-  EF_RIGHT_MOUSE_BUTTON  = 1 << 6,
-  EF_COMMAND_DOWN        = 1 << 7,  // GUI Key (e.g. Command on OS X keyboards,
-                                    // Search on Chromebook keyboards,
-                                    // Windows on MS-oriented keyboards)
-  EF_EXTENDED            = 1 << 8,  // Windows extended key (see WM_KEYDOWN doc)
-  EF_IS_SYNTHESIZED      = 1 << 9,
-  EF_ALTGR_DOWN          = 1 << 10,
-  EF_MOD3_DOWN           = 1 << 11,
+  EF_NONE                 = 0,       // Used to denote no flags explicitly
+  EF_CAPS_LOCK_DOWN       = 1 << 0,
+  EF_SHIFT_DOWN           = 1 << 1,
+  EF_CONTROL_DOWN         = 1 << 2,
+  EF_ALT_DOWN             = 1 << 3,
+  EF_LEFT_MOUSE_BUTTON    = 1 << 4,
+  EF_MIDDLE_MOUSE_BUTTON  = 1 << 5,
+  EF_RIGHT_MOUSE_BUTTON   = 1 << 6,
+  EF_COMMAND_DOWN         = 1 << 7,  // GUI Key (e.g. Command on OS X
+                                     // keyboards, Search on Chromebook
+                                     // keyboards, Windows on MS-oriented
+                                     // keyboards)
+  EF_EXTENDED             = 1 << 8,  // Windows extended key (see WM_KEYDOWN
+                                     // doc)
+  EF_IS_SYNTHESIZED       = 1 << 9,
+  EF_ALTGR_DOWN           = 1 << 10,
+  EF_MOD3_DOWN            = 1 << 11,
+  EF_BACK_MOUSE_BUTTON    = 1 << 12,
+  EF_FORWARD_MOUSE_BUTTON = 1 << 13,
 };
 
 // Flags specific to key events
 enum KeyEventFlags {
-  EF_NUMPAD_KEY         = 1 << 16,  // Key originates from number pad (Xkb only)
-  EF_IME_FABRICATED_KEY = 1 << 17,  // Key event fabricated by the underlying
+  EF_IME_FABRICATED_KEY = 1 << 16,  // Key event fabricated by the underlying
                                     // IME without a user action.
                                     // (Linux X11 only)
-  EF_IS_REPEAT          = 1 << 18,
-  EF_FUNCTION_KEY       = 1 << 19,  // Key originates from function key row
-  EF_FINAL              = 1 << 20,  // Do not remap; the event was created with
+  EF_IS_REPEAT          = 1 << 17,
+  EF_FINAL              = 1 << 18,  // Do not remap; the event was created with
                                     // the desired final values.
 };
 
@@ -119,12 +119,17 @@ 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   = 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_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_DISABLE_SYNC_HANDLING =
+      1 << 2,  // The event shouldn't be handled synchronously. This
+               // happens if the event is being handled
+               // asynchronously, or if the event is invalid and
+               // shouldn't be handled at all.
 };
 
 // Phase of the event dispatch.