Add modifier flags to MotionEvent

ui/events/gesture_detection/motion_event.h

 // Copyright 2014 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_GESTURE_DETECTION_MOTION_EVENT_H_
 #define UI_EVENTS_GESTURE_DETECTION_MOTION_EVENT_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
@@ skipping 22 matching lines @@
   };
 
   enum ButtonType {
     BUTTON_PRIMARY = 1 << 0,
     BUTTON_SECONDARY = 1 << 1,
     BUTTON_TERTIARY = 1 << 2,
     BUTTON_BACK = 1 << 3,
     BUTTON_FORWARD = 1 << 4,
   };
 
+  enum Modifiers {

[tdresser, 2014/09/11 20:51:18]

Where are these used?

[jdduke (slow), 2014/09/11 20:51:57]

Oops, they're not, I'll remove.

[jdduke (slow), 2014/09/11 20:57:17]

Done.

+    MODIFIER_SHIFT = 1 << 0,
+    MODIFIER_CONTROL = 1 << 1,
+    MODIFIER_ALT = 1 << 2,
+    MODIFIER_META = 1 << 3,
+    MODIFIER_CAPS_LOCK_ON = 1 << 4,
+    MODIFIER_NUM_LOCK_ON = 1 << 5
+  };
+
   // The implementer promises that |GetPointerId()| will never exceed
   // MAX_POINTER_ID.
   enum { MAX_POINTER_ID = 31, MAX_TOUCH_POINT_COUNT = 12 };
 
   virtual ~MotionEvent() {}
 
   virtual int GetId() const = 0;
   virtual Action GetAction() const = 0;
   // Only valid if |GetAction()| returns ACTION_POINTER_UP or
   // ACTION_POINTER_DOWN.
   virtual int GetActionIndex() const = 0;
   virtual size_t GetPointerCount() const = 0;
   virtual int GetPointerId(size_t pointer_index) const = 0;
   virtual float GetX(size_t pointer_index) const = 0;
   virtual float GetY(size_t pointer_index) const = 0;
   virtual float GetRawX(size_t pointer_index) const = 0;
   virtual float GetRawY(size_t pointer_index) const = 0;
   virtual float GetTouchMajor(size_t pointer_index) const = 0;
   virtual float GetTouchMinor(size_t pointer_index) const = 0;
   virtual float GetOrientation(size_t pointer_index) const = 0;
   virtual float GetPressure(size_t pointer_index) const = 0;
   virtual ToolType GetToolType(size_t pointer_index) const = 0;
   virtual int GetButtonState() const = 0;
+  virtual int GetFlags() const = 0;
   virtual base::TimeTicks GetEventTime() const = 0;
 
   // Optional historical data, default implementation provides an empty history.
   virtual size_t GetHistorySize() const;
   virtual base::TimeTicks GetHistoricalEventTime(size_t historical_index) const;
   virtual float GetHistoricalTouchMajor(size_t pointer_index,
                                         size_t historical_index) const;
   virtual float GetHistoricalX(size_t pointer_index,
                                size_t historical_index) const;
   virtual float GetHistoricalY(size_t pointer_index,
@@ skipping 24 matching lines @@
 };
 
 GESTURE_DETECTION_EXPORT bool operator==(const MotionEvent& lhs,
                                          const MotionEvent& rhs);
 GESTURE_DETECTION_EXPORT bool operator!=(const MotionEvent& lhs,
                                          const MotionEvent& rhs);
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_GESTURE_DETECTION_MOTION_EVENT_H_