Rename gfx::Monitor to gfx::Display

ui/aura/desktop/desktop_screen_x11.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/desktop/desktop_screen.h"
 
 #include <X11/Xlib.h>
 
 // It clashes with out RootWindow.
 #undef RootWindow
 
 #include "base/logging.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/base/x/x11_util.h"
-#include "ui/gfx/monitor.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen_impl.h"
 
 namespace {
 
 // TODO(erg): This method is a temporary hack, until we can reliably extract
 // location data out of XRandR.
 gfx::Size GetPrimaryMonitorSize() {
   ::Display* display = ui::GetXDisplay();
   ::Screen* screen = DefaultScreenOfDisplay(display);
   int width = WidthOfScreen(screen);
   int height = HeightOfScreen(screen);
 
   return gfx::Size(width, height);
 }
 
 class DesktopScreenX11 : public gfx::ScreenImpl {
  public:
   DesktopScreenX11();
   virtual ~DesktopScreenX11();
 
   // Overridden from gfx::ScreenImpl:
   virtual gfx::Point GetCursorScreenPoint() OVERRIDE;
   virtual gfx::NativeWindow GetWindowAtCursorScreenPoint() OVERRIDE;
   virtual int GetNumMonitors() OVERRIDE;
-  virtual gfx::Monitor GetMonitorNearestWindow(
+  virtual gfx::Display GetMonitorNearestWindow(
       gfx::NativeView window) const OVERRIDE;
-  virtual gfx::Monitor GetMonitorNearestPoint(
+  virtual gfx::Display GetMonitorNearestPoint(
       const gfx::Point& point) const OVERRIDE;
-  virtual gfx::Monitor GetPrimaryMonitor() const OVERRIDE;
+  virtual gfx::Display GetPrimaryMonitor() const OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopScreenX11, public:
 
 DesktopScreenX11::DesktopScreenX11() {
 }
@@ skipping 28 matching lines @@
   // http://codereview.chromium.org/10279005/
   return NULL;
 }
 
 int DesktopScreenX11::GetNumMonitors() {
   // TODO(erg): Figure this out with oshima or piman because I have no clue
   // about the XRandR implications here.
   return 1;
 }
 
-gfx::Monitor DesktopScreenX11::GetMonitorNearestWindow(
+gfx::Display DesktopScreenX11::GetMonitorNearestWindow(
     gfx::NativeView window) const {
   // TODO(erg): Do the right thing once we know what that is.
-  return gfx::Monitor(0, gfx::Rect(GetPrimaryMonitorSize()));
+  return gfx::Display(0, gfx::Rect(GetPrimaryMonitorSize()));
 }
 
-gfx::Monitor DesktopScreenX11::GetMonitorNearestPoint(
+gfx::Display DesktopScreenX11::GetMonitorNearestPoint(
     const gfx::Point& point) const {
   // TODO(erg): Do the right thing once we know what that is.
-  return gfx::Monitor(0, gfx::Rect(GetPrimaryMonitorSize()));
+  return gfx::Display(0, gfx::Rect(GetPrimaryMonitorSize()));
 }
 
-gfx::Monitor DesktopScreenX11::GetPrimaryMonitor() const {
+gfx::Display DesktopScreenX11::GetPrimaryMonitor() const {
   // TODO(erg): Do the right thing once we know what that is.
-  return gfx::Monitor(0, gfx::Rect(GetPrimaryMonitorSize()));
+  return gfx::Display(0, gfx::Rect(GetPrimaryMonitorSize()));
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 
 namespace aura {
 
 gfx::ScreenImpl* CreateDesktopScreen() {
   return new DesktopScreenX11;
 }
 
 }  // namespace aura