Add context to gfx::Screen calls in support of simultaneous desktop+ash

ash/screen_ash.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 "ash/screen_ash.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/multi_display_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
@@ skipping 78 matching lines @@
 // static
 const gfx::Display& ScreenAsh::GetSecondaryDisplay() {
   return *(Shell::GetInstance()->display_controller()->GetSecondaryDisplay());
 }
 
 gfx::Point ScreenAsh::GetCursorScreenPoint() {
   return aura::Env::GetInstance()->last_mouse_location();
 }
 
 gfx::NativeWindow ScreenAsh::GetWindowAtCursorScreenPoint() {
-  const gfx::Point point = gfx::Screen::GetCursorScreenPoint();
+  const gfx::Point point = gfx::Screen::GetCursorScreenPoint(
+      ash::Shell::GetRootNativeView());
   return wm::GetRootWindowAt(point)->GetTopWindowContainingPoint(point);
 }
 
 int ScreenAsh::GetNumDisplays() {
   return GetDisplayManager()->GetNumDisplays();
 }
 
 gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const {
   return GetDisplayManager()->GetDisplayNearestWindow(window);
 }
 
 gfx::Display ScreenAsh::GetDisplayNearestPoint(const gfx::Point& point) const {
   return GetDisplayManager()->GetDisplayNearestPoint(point);
 }
 
 gfx::Display ScreenAsh::GetDisplayMatching(const gfx::Rect& match_rect) const {
   return GetDisplayManager()->GetDisplayMatching(match_rect);
 }
 
 gfx::Display ScreenAsh::GetPrimaryDisplay() const {
   return DisplayController::GetPrimaryDisplay();
 }
 
 }  // namespace ash