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

ui/gfx/screen_win.cc

Index: ui/gfx/screen_win.cc
diff --git a/ui/gfx/screen_win.cc b/ui/gfx/screen_win.cc
index 47583608d7531ee4c3f8785a382a6d398cb77b44..64bc5462495e6d408ef2a8dc5d050d5d40b3e3c7 100644
--- a/ui/gfx/screen_win.cc
+++ b/ui/gfx/screen_win.cc
@@ -35,20 +35,21 @@ bool Screen::IsDIPEnabled() {
 }
 
 // static
-gfx::Point Screen::GetCursorScreenPoint() {
+gfx::Point Screen::GetCursorScreenPoint(gfx::NativeView context) {
   POINT pt;
   GetCursorPos(&pt);
   return gfx::Point(pt);
 }
 
 // static
-gfx::NativeWindow Screen::GetWindowAtCursorScreenPoint() {
+gfx::NativeWindow Screen::GetWindowAtCursorScreenPoint(
+    gfx::NativeView context) {
   POINT location;
   return GetCursorPos(&location) ? WindowFromPoint(location) : NULL;
 }
 
 // static
-int Screen::GetNumDisplays() {
+int Screen::GetNumDisplays(gfx::NativeView context) {
   return GetSystemMetrics(SM_CMONITORS);
 }
 
@@ -62,7 +63,8 @@ gfx::Display Screen::GetDisplayNearestWindow(gfx::NativeView window) {
 }
 
 // static
-gfx::Display Screen::GetDisplayNearestPoint(const gfx::Point& point) {
+gfx::Display Screen::GetDisplayNearestPoint(
+    gfx::NativeView context, const gfx::Point& point) {
   POINT initial_loc = { point.x(), point.y() };
   HMONITOR monitor = MonitorFromPoint(initial_loc, MONITOR_DEFAULTTONEAREST);
   MONITORINFO mi = {0};
@@ -73,7 +75,8 @@ gfx::Display Screen::GetDisplayNearestPoint(const gfx::Point& point) {
 }
 
 // static
-gfx::Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
+gfx::Display Screen::GetDisplayMatching(
+    gfx::NativeView context, const gfx::Rect& match_rect) {
   RECT other_bounds_rect = match_rect.ToRECT();
   MONITORINFO monitor_info = GetMonitorInfoForMonitor(MonitorFromRect(
       &other_bounds_rect, MONITOR_DEFAULTTONEAREST));
@@ -81,7 +84,7 @@ gfx::Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
 }
 
 // static
-gfx::Display Screen::GetPrimaryDisplay() {
+gfx::Display Screen::GetPrimaryDisplay(gfx::NativeView context) {
   MONITORINFO mi = GetMonitorInfoForMonitor(
       MonitorFromWindow(NULL, MONITOR_DEFAULTTOPRIMARY));
   gfx::Display display = GetDisplay(mi);