Target touches to the correct display.

ui/aura/root_window.cc

 // Copyright (c) 2012 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/root_window.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 1019 matching lines @@
 
     default:
       break;
   }
   TransformEventForDeviceScaleFactor(event);
   Window* target = client::GetCaptureWindow(window());
   if (!target) {
     target = ConsumerToWindow(
         ui::GestureRecognizer::Get()->GetTouchLockedTarget(*event));
     if (!target) {
-      target = ConsumerToWindow(ui::GestureRecognizer::Get()->
-          GetTargetForLocation(event->location()));
+      target = ConsumerToWindow(
+          ui::GestureRecognizer::Get()->
+          GetTargetForLocation(event->location(), event->source_device_id()));
     }
   }
 
   // The gesture recognizer processes touch events in the system coordinates. So
   // keep a copy of the touch event here before possibly converting the event to
   // a window's local coordinate system.
   ui::TouchEvent event_for_gr(*event);
 
   ui::EventResult result = ui::ER_UNHANDLED;
   if (!target && !window()->bounds().Contains(event->location())) {
@@ skipping 100 matching lines @@
 }
 
 gfx::Transform RootWindow::GetInverseRootTransform() const {
   float scale = ui::GetDeviceScaleFactor(window()->layer());
   gfx::Transform transform;
   transform.Scale(1.0f / scale, 1.0f / scale);
   return transformer_->GetInverseTransform() * transform;
 }
 
 }  // namespace aura