Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 116 insertions, 0 deletions

diff --git a/chromium/ui/events/event_constants.h b/chromium/ui/events/event_constants.h
new file mode 100644
index 00000000000..6c0e9f71bc0
--- /dev/null
+++ b/chromium/ui/events/event_constants.h
@@ -0,0 +1,116 @@
+// 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.
+
+#ifndef UI_EVENTS_EVENT_CONSTANTS_H_
+#define UI_EVENTS_EVENT_CONSTANTS_H_
+
+namespace ui {
+
+// Event types. (prefixed because of a conflict with windows headers)
+enum EventType {
+  ET_UNKNOWN = 0,
+  ET_MOUSE_PRESSED,
+  ET_MOUSE_DRAGGED,
+  ET_MOUSE_RELEASED,
+  ET_MOUSE_MOVED,
+  ET_MOUSE_ENTERED,
+  ET_MOUSE_EXITED,
+  ET_KEY_PRESSED,
+  ET_KEY_RELEASED,
+  ET_MOUSEWHEEL,
+  ET_MOUSE_CAPTURE_CHANGED,  // Event has no location.
+  ET_TOUCH_RELEASED,
+  ET_TOUCH_PRESSED,
+  ET_TOUCH_MOVED,
+  ET_TOUCH_STATIONARY,
+  ET_TOUCH_CANCELLED,
+  ET_DROP_TARGET_EVENT,
+  ET_TRANSLATED_KEY_PRESS,
+  ET_TRANSLATED_KEY_RELEASE,
+
+  // GestureEvent types
+  ET_GESTURE_SCROLL_BEGIN,
+  ET_GESTURE_SCROLL_END,
+  ET_GESTURE_SCROLL_UPDATE,
+  ET_GESTURE_TAP,
+  ET_GESTURE_TAP_DOWN,
+  ET_GESTURE_TAP_CANCEL,
+  ET_GESTURE_BEGIN,  // Sent before any other gesture types.
+  ET_GESTURE_END,    // Sent after any other gestures.
+  ET_GESTURE_TWO_FINGER_TAP,
+  ET_GESTURE_PINCH_BEGIN,
+  ET_GESTURE_PINCH_END,
+  ET_GESTURE_PINCH_UPDATE,
+  ET_GESTURE_LONG_PRESS,
+  ET_GESTURE_LONG_TAP,
+  // A SWIPE gesture can happen at the end of a TAP_UP gesture if the
+  // finger(s) were moving quickly before they are released.
+  ET_GESTURE_MULTIFINGER_SWIPE,
+
+  // Scroll support.
+  // TODO[davemoore] we need to unify these events w/ touch and gestures.
+  ET_SCROLL,
+  ET_SCROLL_FLING_START,
+  ET_SCROLL_FLING_CANCEL,
+
+  // Sent by the system to indicate any modal type operations, such as drag and
+  // drop or menus, should stop.
+  ET_CANCEL_MODE,
+
+  // Sent by the CrOS gesture library for interesting patterns that we want
+  // to track with the UMA system.
+  ET_UMA_DATA,
+
+  // Must always be last. User namespace starts above this value.
+  // See ui::RegisterCustomEventType().
+  ET_LAST
+};
+
+// 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,  // Only useful on OSX
+  EF_EXTENDED            = 1 << 8,  // Windows extended key (see WM_KEYDOWN doc)
+  EF_IS_SYNTHESIZED      = 1 << 9,
+  EF_ALTGR_DOWN          = 1 << 10,
+};
+
+// Flags specific to mouse events
+enum MouseEventFlags {
+  EF_IS_DOUBLE_CLICK    = 1 << 16,
+  EF_IS_TRIPLE_CLICK    = 1 << 17,
+  EF_IS_NON_CLIENT      = 1 << 18,
+  EF_FROM_TOUCH         = 1 << 19,  // Indicates this mouse event is generated
+                                    // from an unconsumed touch/gesture event.
+};
+
+// 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.
+};
+
+// Phase of the event dispatch.
+enum EventPhase {
+  EP_PREDISPATCH,
+  EP_PRETARGET,
+  EP_TARGET,
+  EP_POSTTARGET,
+  EP_POSTDISPATCH
+};
+
+}  // namespace ui
+
+#endif  // UI_EVENTS_EVENT_CONSTANTS_H_