Rename gfx::Monitor to gfx::Display

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"
-#include "ui/gfx/monitor.h"
+#include "ui/gfx/display.h"
 
 namespace {
 
 bool GetScreenWorkArea(gfx::Rect* out_rect) {
   gboolean ok;
   guchar* raw_data = NULL;
   gint data_len = 0;
   ok = gdk_property_get(gdk_get_default_root_window(),  // a gdk window
                         gdk_atom_intern("_NET_WORKAREA", FALSE),  // property
                         gdk_atom_intern("CARDINAL", FALSE),  // property type
@@ skipping 74 matching lines @@
   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);
   return GTK_IS_WINDOW(widget) ? GTK_WINDOW(widget) : NULL;
 }
 
 // static
-gfx::Monitor Screen::GetMonitorNearestWindow(gfx::NativeView view) {
+gfx::Display Screen::GetMonitorNearestWindow(gfx::NativeView view) {
   gfx::Rect bounds = GetMonitorAreaNearestWindow(view);
   // Do not use the _NET_WORKAREA here, this is supposed to be an area on a
   // specific monitor, and _NET_WORKAREA is a hint from the WM that generally
   // spans across all monitors.  This would make the work area larger than the
   // monitor.
   // 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 monitor to construct a work area.
+  // area of the display to construct a work area.
   // TODO(oshima): Implement ID and Observer.
-  return gfx::Monitor(0, bounds);
+  return gfx::Display(0, bounds);
 }
 
 // static
-gfx::Monitor Screen::GetMonitorNearestPoint(const gfx::Point& point) {
+gfx::Display Screen::GetMonitorNearestPoint(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::Monitor(0, gfx::Rect(bounds));
+  return gfx::Display(0, gfx::Rect(bounds));
 }
 
 // static
-gfx::Monitor Screen::GetPrimaryMonitor() {
+gfx::Display Screen::GetPrimaryMonitor() {
   gfx::Rect bounds = NativePrimaryMonitorBounds();
   // TODO(oshima): Implement ID and Observer.
-  gfx::Monitor monitor(0, bounds);
+  gfx::Display display(0, bounds);
   gfx::Rect rect;
   if (GetScreenWorkArea(&rect)) {
-    monitor.set_work_area(rect.Intersect(bounds));
+    display.set_work_area(rect.Intersect(bounds));
   } else {
     // Return the best we've got.
-    monitor.set_work_area(bounds);
+    display.set_work_area(bounds);
   }
-  return monitor;
+  return display;
 }
 
 // static
-gfx::Monitor Screen::GetMonitorMatching(const gfx::Rect& match_rect) {
+gfx::Display Screen::GetMonitorMatching(const gfx::Rect& match_rect) {
   // TODO(thestig) Implement multi-monitor support.
   return GetPrimaryMonitor();
 }
 
 // static
 int Screen::GetNumMonitors() {
   // 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