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

ui/aura/desktop/desktop_screen_win.cc

Index: ui/aura/desktop/desktop_screen_win.cc
diff --git a/ui/aura/desktop/desktop_screen_win.cc b/ui/aura/desktop/desktop_screen_win.cc
index 1eebb68b37bf99c94741f1e12b3a749532ce5538..5738d9ba659d1079e595e6fbe8126e879b92d946 100644
--- a/ui/aura/desktop/desktop_screen_win.cc
+++ b/ui/aura/desktop/desktop_screen_win.cc
@@ -58,11 +58,11 @@ gfx::NativeWindow DesktopScreenWin::GetWindowAtCursorScreenPoint() {
   return host ? host->GetRootWindow() : NULL;
 }
 
-int DesktopScreenWin::GetNumMonitors() {
+int DesktopScreenWin::GetNumDisplays() {
   return GetSystemMetrics(SM_CMONITORS);
 }
 
-gfx::Display DesktopScreenWin::GetMonitorNearestWindow(
+gfx::Display DesktopScreenWin::GetDisplayNearestWindow(
     gfx::NativeView window) const {
   gfx::AcceleratedWidget accelerated_window =
       window->GetRootWindow()->GetAcceleratedWidget();
@@ -74,7 +74,7 @@ gfx::Display DesktopScreenWin::GetMonitorNearestWindow(
   return GetDisplay(monitor_info);
 }
 
-gfx::Display DesktopScreenWin::GetMonitorNearestPoint(
+gfx::Display DesktopScreenWin::GetDisplayNearestPoint(
     const gfx::Point& point) const {
   POINT initial_loc = { point.x(), point.y() };
   HMONITOR monitor = MonitorFromPoint(initial_loc, MONITOR_DEFAULTTONEAREST);
@@ -85,7 +85,7 @@ gfx::Display DesktopScreenWin::GetMonitorNearestPoint(
   return gfx::Display();
 }
 
-gfx::Display DesktopScreenWin::GetPrimaryMonitor() const {
+gfx::Display DesktopScreenWin::GetPrimaryDisplay() const {
   MONITORINFO mi = GetMonitorInfoForMonitor(
       MonitorFromWindow(NULL, MONITOR_DEFAULTTOPRIMARY));
   gfx::Display display = GetDisplay(mi);