Revert 243974 "Target touches to the correct display."

trunk/src/ui/events/event.cc

Index: trunk/src/ui/events/event.cc
===================================================================
--- trunk/src/ui/events/event.cc	(revision 244019)
+++ trunk/src/ui/events/event.cc	(working copy)
@@ -5,7 +5,6 @@
 #include "ui/events/event.h"
 
 #if defined(USE_X11)
-#include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 #endif
 
@@ -438,8 +437,7 @@
       radius_x_(GetTouchRadiusX(native_event)),
       radius_y_(GetTouchRadiusY(native_event)),
       rotation_angle_(GetTouchAngle(native_event)),
-      force_(GetTouchForce(native_event)),
-      source_device_id_(-1) {
+      force_(GetTouchForce(native_event)) {
   latency()->AddLatencyNumberWithTimestamp(
       INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT,
       0,
@@ -447,12 +445,6 @@
       base::TimeTicks::FromInternalValue(time_stamp().ToInternalValue()),
       1,
       true);
-
-#if defined(USE_X11)
-  XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(native_event->xcookie.data);
-  source_device_id_ = xiev->deviceid;
-#endif
-
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
 }
 
@@ -465,8 +457,7 @@
       radius_x_(0.0f),
       radius_y_(0.0f),
       rotation_angle_(0.0f),
-      force_(0.0f),
-      source_device_id_(-1) {
+      force_(0.0f) {
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
 }
 
@@ -484,8 +475,7 @@
       radius_x_(radius_x),
       radius_y_(radius_y),
       rotation_angle_(angle),
-      force_(force),
-      source_device_id_(-1) {
+      force_(force) {
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
 }