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

ui/gfx/screen_aura.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 "base/logging.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen_impl.h"
@@ skipping 24 matching lines @@
 Point Screen::GetCursorScreenPoint() {
   return g_instance_->GetCursorScreenPoint();
 }
 
 // static
 NativeWindow Screen::GetWindowAtCursorScreenPoint() {
   return g_instance_->GetWindowAtCursorScreenPoint();
 }
 
 // static
-int Screen::GetNumMonitors() {
-  return g_instance_->GetNumMonitors();
+int Screen::GetNumDisplays() {
+  return g_instance_->GetNumDisplays();
 }
 
 // static
-Display Screen::GetMonitorNearestWindow(NativeView window) {
-  return g_instance_->GetMonitorNearestWindow(window);
+Display Screen::GetDisplayNearestWindow(NativeView window) {
+  return g_instance_->GetDisplayNearestWindow(window);
 }
 
 // static
-Display Screen::GetMonitorNearestPoint(const Point& point) {
-  return g_instance_->GetMonitorNearestPoint(point);
+Display Screen::GetDisplayNearestPoint(const Point& point) {
+  return g_instance_->GetDisplayNearestPoint(point);
 }
 
 // static
-Display Screen::GetPrimaryMonitor() {
-  return g_instance_->GetPrimaryMonitor();
+Display Screen::GetPrimaryDisplay() {
+  return g_instance_->GetPrimaryDisplay();
 }
 
 // static
-Display Screen::GetMonitorMatching(const gfx::Rect& match_rect) {
-  return g_instance_->GetMonitorNearestPoint(match_rect.CenterPoint());
+Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
+  return g_instance_->GetDisplayNearestPoint(match_rect.CenterPoint());
 }
 
 }  // namespace gfx