Revert 243974 "Target touches to the correct display."

trunk/src/ui/aura/window_targeter.cc

 // Copyright (c) 2013 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.
 
 #include "ui/aura/window_targeter.h"
 
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/event_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/root_window.h"
@@ skipping 92 matching lines @@
     return capture_window;
 
   if (event.IsTouchEvent()) {
     // Query the gesture-recognizer to find targets for touch events.
     const ui::TouchEvent& touch = static_cast<const ui::TouchEvent&>(event);
     ui::GestureConsumer* consumer =
         ui::GestureRecognizer::Get()->GetTouchLockedTarget(touch);
     if (consumer)
       return static_cast<Window*>(consumer);
     consumer =
-        ui::GestureRecognizer::Get()->GetTargetForLocation(
-            event.location(), touch.source_device_id());
+        ui::GestureRecognizer::Get()->GetTargetForLocation(event.location());
     if (consumer)
       return static_cast<Window*>(consumer);
 
     // If the initial touch is outside the root window, target the root.
     if (!root_window->bounds().Contains(event.location()))
       return root_window;
   }
 
   return NULL;
 }
 
 }  // namespace aura