Revert 243974 "Target touches to the correct display."

trunk/src/ui/events/gestures/gesture_recognizer_impl.cc

Index: trunk/src/ui/events/gestures/gesture_recognizer_impl.cc
===================================================================
--- trunk/src/ui/events/gestures/gesture_recognizer_impl.cc	(revision 244019)
+++ trunk/src/ui/events/gestures/gesture_recognizer_impl.cc	(working copy)
@@ -78,17 +78,15 @@
 }
 
 GestureConsumer* GestureRecognizerImpl::GetTargetForLocation(
-    const gfx::Point& location, int source_device_id) {
+    const gfx::Point& location) {
   const GesturePoint* closest_point = NULL;
   int64 closest_distance_squared = 0;
   std::map<GestureConsumer*, GestureSequence*>::iterator i;
   for (i = consumer_sequence_.begin(); i != consumer_sequence_.end(); ++i) {
     const GesturePoint* points = i->second->points();
     for (int j = 0; j < GestureSequence::kMaxGesturePoints; ++j) {
-      if (!points[j].in_use() ||
-          source_device_id != points[j].source_device_id()) {
+      if (!points[j].in_use())
         continue;
-      }
       gfx::Vector2d delta = points[j].last_touch_position() - location;
       // Relative distance is all we need here, so LengthSquared() is
       // appropriate, and cheaper than Length().
@@ -273,11 +271,6 @@
   return g_gesture_recognizer_instance;
 }
 
-// GestureRecognizer, static
-void GestureRecognizer::Reset() {
-  g_gesture_recognizer_instance = NULL;
-}
-
 void SetGestureRecognizerForTesting(GestureRecognizer* gesture_recognizer) {
   // Transfer helpers to the new GR.
   std::vector<GestureEventHelper*>& helpers =