Rename gfx::Monitor to gfx::Display

ui/gfx/screen_aura.cc

Index: ui/gfx/screen_aura.cc
diff --git a/ui/gfx/screen_aura.cc b/ui/gfx/screen_aura.cc
index 7341a0edc07d469c235bb354cba1e74349b2a703..3298ba1c7ac512f4bab972b9d7cf9a46912779bc 100644
--- a/ui/gfx/screen_aura.cc
+++ b/ui/gfx/screen_aura.cc
@@ -5,7 +5,7 @@
 #include "ui/gfx/screen.h"
 
 #include "base/logging.h"
-#include "ui/gfx/monitor.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen_impl.h"
 
@@ -47,22 +47,22 @@ int Screen::GetNumMonitors() {
 }
 
 // static
-Monitor Screen::GetMonitorNearestWindow(NativeView window) {
+Display Screen::GetMonitorNearestWindow(NativeView window) {
   return g_instance_->GetMonitorNearestWindow(window);
 }
 
 // static
-Monitor Screen::GetMonitorNearestPoint(const Point& point) {
+Display Screen::GetMonitorNearestPoint(const Point& point) {
   return g_instance_->GetMonitorNearestPoint(point);
 }
 
 // static
-Monitor Screen::GetPrimaryMonitor() {
+Display Screen::GetPrimaryMonitor() {
   return g_instance_->GetPrimaryMonitor();
 }
 
 // static
-Monitor Screen::GetMonitorMatching(const gfx::Rect& match_rect) {
+Display Screen::GetMonitorMatching(const gfx::Rect& match_rect) {
   return g_instance_->GetMonitorNearestPoint(match_rect.CenterPoint());
 }