Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX.

ash/screen_ash.h

Index: ash/screen_ash.h
diff --git a/ash/screen_ash.h b/ash/screen_ash.h
index bfe29b3f782685c23889f974b5f59751c17015e2..bd987d325e328167b53f7facde5c2bcb38c7de9b 100644
--- a/ash/screen_ash.h
+++ b/ash/screen_ash.h
@@ -32,12 +32,12 @@ class ASH_EXPORT ScreenAsh : public gfx::ScreenImpl {
   virtual gfx::Point GetCursorScreenPoint() OVERRIDE;
   virtual gfx::NativeWindow GetWindowAtCursorScreenPoint() OVERRIDE;
 
-  virtual int GetNumMonitors() OVERRIDE;
-  virtual gfx::Display GetMonitorNearestWindow(
+  virtual int GetNumDisplays() OVERRIDE;
+  virtual gfx::Display GetDisplayNearestWindow(
       gfx::NativeView view) const OVERRIDE;
-  virtual gfx::Display GetMonitorNearestPoint(
+  virtual gfx::Display GetDisplayNearestPoint(
       const gfx::Point& point) const OVERRIDE;
-  virtual gfx::Display GetPrimaryMonitor() const OVERRIDE;
+  virtual gfx::Display GetPrimaryDisplay() const OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenAsh);