Use XInput2 events for keyboard events.

ui/events/event.h

Index: ui/events/event.h
diff --git a/ui/events/event.h b/ui/events/event.h
index 42cdd8dfd759f45ec9f8bb425d119f7291dff264..d23dfd00d69d45f5456f3e61bf9507fde45590e3 100644
--- a/ui/events/event.h
+++ b/ui/events/event.h
@@ -68,6 +68,12 @@ class EVENTS_EXPORT Event {
   const LatencyInfo* latency() const { return &latency_; }
   void set_latency(const LatencyInfo& latency) { latency_ = latency; }
 
+  int source_device_id() const { return source_device_id_; }
+  // For testing.
+  void set_source_device_id(int source_device_id) {
+    source_device_id_ = source_device_id;
+  }
+
   // By default, events are "cancelable", this means any default processing that
   // the containing abstraction layer may perform can be prevented by calling
   // SetHandled(). SetHandled() or StopPropagation() must not be called for
@@ -230,6 +236,10 @@ class EVENTS_EXPORT Event {
   EventTarget* target_;
   EventPhase phase_;
   EventResult result_;
+
+  // The device id the event came from, or ED_UNKNOWN_DEVICE if the information
+  // is not available.
+  int source_device_id_;

[Daniel Erat, 2014/06/25 17:13:24]

nit: is the "source" prefix here necessary, or would a shorter "device_id" name
be equally understandable?

(after writing this, i saw that this member already exists and is being moved,
so feel free to ignore that suggestion if it'd require updating a bunch of
existing code)

[kpschoedel, 2014/06/25 19:59:48]

Yes, touch events already had this. I'll defer to Sadrul on the name.

 };
 
 class EVENTS_EXPORT CancelModeEvent : public Event {
@@ -388,6 +398,7 @@ class EVENTS_EXPORT MouseEvent : public LocatedEvent {
   // NOTE: during a press and release flags() contains the complete set of
   // flags. Use this to determine the button that was pressed or released.
   int changed_button_flags() const { return changed_button_flags_; }
+  void set_changed_button_flags(int flags) { changed_button_flags_ = flags; }
 
  private:
   // Returns the repeat count based on the previous mouse click, if it is
@@ -448,8 +459,7 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
         radius_x_(model.radius_x_),
         radius_y_(model.radius_y_),
         rotation_angle_(model.rotation_angle_),
-        force_(model.force_),
-        source_device_id_(model.source_device_id_) {
+        force_(model.force_) {
   }
 
   TouchEvent(EventType type,
@@ -474,14 +484,10 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
   float radius_y() const { return radius_y_; }
   float rotation_angle() const { return rotation_angle_; }
   float force() const { return force_; }
-  int source_device_id() const { return source_device_id_; }
 
   // Used for unit tests.
   void set_radius_x(const float r) { radius_x_ = r; }
   void set_radius_y(const float r) { radius_y_ = r; }
-  void set_source_device_id(int source_device_id) {
-    source_device_id_ = source_device_id;
-  }
 
   // Overridden from LocatedEvent.
   virtual void UpdateForRootTransform(
@@ -515,9 +521,6 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
 
   // Force (pressure) of the touch. Normalized to be [0, 1]. Default to be 0.0.
   float force_;
-
-  // The device id of the screen the event came from. Default to be -1.
-  int source_device_id_;
 };
 
 class EVENTS_EXPORT KeyEvent : public Event {