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

ui/gfx/screen_gtk.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/gfx/screen.h"
 
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
@@ skipping 63 matching lines @@
 }  // namespace
 
 namespace gfx {
 
 // static
 bool Screen::IsDIPEnabled() {
   return false;
 }
 
 // static
-gfx::Point Screen::GetCursorScreenPoint() {
+gfx::Point Screen::GetCursorScreenPoint(gfx::NativeView context) {
   gint x, y;
   gdk_display_get_pointer(gdk_display_get_default(), NULL, &x, &y, NULL);
   return gfx::Point(x, y);
 }
 
 // static
-gfx::NativeWindow Screen::GetWindowAtCursorScreenPoint() {
+gfx::NativeWindow Screen::GetWindowAtCursorScreenPoint(
+    gfx::NativeView context) {
   GdkWindow* window = gdk_window_at_pointer(NULL, NULL);
   if (!window)
     return NULL;
 
   gpointer data = NULL;
   gdk_window_get_user_data(window, &data);
   GtkWidget* widget = reinterpret_cast<GtkWidget*>(data);
   if (!widget)
     return NULL;
   widget = gtk_widget_get_toplevel(widget);
@@ skipping 10 matching lines @@
   // TODO(danakj) This is a work-around as there is no standard way to get this
   // area, but it is a rect that we should be computing.  The standard means
   // to compute this rect would be to watch all windows with
   // _NET_WM_STRUT(_PARTIAL) hints, and subtract their space from the physical
   // area of the display to construct a work area.
   // TODO(oshima): Implement ID and Observer.
   return gfx::Display(0, bounds);
 }
 
 // static
-gfx::Display Screen::GetDisplayNearestPoint(const gfx::Point& point) {
+gfx::Display Screen::GetDisplayNearestPoint(
+    gfx::NativeView context, const gfx::Point& point) {
   GdkScreen* screen = gdk_screen_get_default();
   gint monitor = gdk_screen_get_monitor_at_point(screen, point.x(), point.y());
   GdkRectangle bounds;
   gdk_screen_get_monitor_geometry(screen, monitor, &bounds);
   // TODO(oshima): Implement ID and Observer.
   return gfx::Display(0, gfx::Rect(bounds));
 }
 
 // static
-gfx::Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
+gfx::Display Screen::GetDisplayMatching(
+    gfx::NativeView context, const gfx::Rect& match_rect) {
   // TODO(thestig) Implement multi-monitor support.
   return GetPrimaryDisplay();
 }
 
 // static
-gfx::Display Screen::GetPrimaryDisplay() {
+gfx::Display Screen::GetPrimaryDisplay(gfx::NativeView context) {
   gfx::Rect bounds = NativePrimaryMonitorBounds();
   // TODO(oshima): Implement ID and Observer.
   gfx::Display display(0, bounds);
   gfx::Rect rect;
   if (GetScreenWorkArea(&rect)) {
     display.set_work_area(rect.Intersect(bounds));
   } else {
     // Return the best we've got.
     display.set_work_area(bounds);
   }
   return display;
 }
 
 // static
-int Screen::GetNumDisplays() {
+int Screen::GetNumDisplays(gfx::NativeView context) {
   // This query is kinda bogus for Linux -- do we want number of X screens?
   // The number of monitors Xinerama has?  We'll just use whatever GDK uses.
   GdkScreen* screen = gdk_screen_get_default();
   return gdk_screen_get_n_monitors(screen);
 }
 
 }  // namespace gfx