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

ui/aura/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/window.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 410 matching lines @@
   return NULL;
 }
 
 // static
 void Window::ConvertPointToTarget(const Window* source,
                                   const Window* target,
                                   gfx::Point* point) {
   if (!source)
     return;
   if (source->GetRootWindow() != target->GetRootWindow()) {
-    const gfx::Point source_origin =
-        gfx::Screen::GetDisplayNearestWindow(
-            const_cast<Window*>(source)).bounds().origin();
-    const gfx::Point target_origin =
-        gfx::Screen::GetDisplayNearestWindow(
-            const_cast<Window*>(target)).bounds().origin();
+    Window* source_window = const_cast<Window*>(source);
+    Window* target_window = const_cast<Window*>(target);
+    const gfx::Point source_origin = gfx::Screen::GetScreenFor(source_window)->
+        GetDisplayNearestWindow(source_window).bounds().origin();
+    const gfx::Point target_origin = gfx::Screen::GetScreenFor(target_window)->
+        GetDisplayNearestWindow(target_window).bounds().origin();
     ui::Layer::ConvertPointToLayer(
         source->layer(), source->GetRootWindow()->layer(), point);
     const gfx::Point offset = source_origin.Subtract(target_origin);
     point->Offset(offset.x(), offset.y());
     ui::Layer::ConvertPointToLayer(
         target->GetRootWindow()->layer(), target->layer(), point);
   } else {
     ui::Layer::ConvertPointToLayer(source->layer(), target->layer(), point);
   }
 }
@@ skipping 526 matching lines @@
   bool contains_mouse = false;
   if (IsVisible()) {
     RootWindow* root_window = GetRootWindow();
     contains_mouse = root_window &&
         ContainsPointInRoot(root_window->GetLastMouseLocationInRoot());
   }
   return contains_mouse;
 }
 
 }  // namespace aura