ASH: Use virtual screen coordinates in Display::bounds()

ash/shell.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/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 303 matching lines @@
 }
 
 // static
 aura::RootWindow* Shell::GetRootWindowAt(const gfx::Point& point) {
   if (!internal::DisplayController::IsVirtualScreenCoordinatesEnabled())
     return GetPrimaryRootWindow();
   RootWindowList root_windows = GetAllRootWindows();
   for (RootWindowList::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     aura::RootWindow* root_window = *iter;
-    if (root_window->bounds().Contains(point))
+    const gfx::Display& display =
+        gfx::Screen::GetDisplayNearestWindow(root_window);
+    if (display.bounds().Contains(point))
       return root_window;
   }
   // Fallback to the primary window if there is no root window containing
   // the |point|.
   return GetPrimaryRootWindow();
 }
 
 // static
 aura::RootWindow* Shell::GetRootWindowMatching(const gfx::Rect& rect) {
   if (!internal::DisplayController::IsVirtualScreenCoordinatesEnabled())
     return GetPrimaryRootWindow();
   if (rect.IsEmpty())
     return GetRootWindowAt(rect.origin());
   RootWindowList root_windows = GetAllRootWindows();
   int max = 0;
   aura::RootWindow* matching = NULL;
   for (RootWindowList::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     aura::RootWindow* root_window = *iter;
-    gfx::Rect intersect = root_window->bounds().Intersect(rect);
+    const gfx::Display& display =
+        gfx::Screen::GetDisplayNearestWindow(root_window);
+    gfx::Rect intersect = display.bounds().Intersect(rect);
     int area = intersect.width() * intersect.height();
     if (area > max) {
       max = area;
       matching = root_window;
     }
   }
   // Fallback to the primary window if there is no matching root window.
   return matching ? matching : GetPrimaryRootWindow();
 }
 
@@ skipping 425 matching lines @@
 }
 
 void Shell::ShowCursor(bool visible) {
   RootWindowList root_windows = GetAllRootWindows();
   for (RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->ShowCursor(visible);
 }
 
 }  // namespace ash