Rename gfx::Monitor to gfx::Display

ui/aura/monitor_manager.cc

Index: ui/aura/monitor_manager.cc
diff --git a/ui/aura/monitor_manager.cc b/ui/aura/monitor_manager.cc
index 3f3b980dcdfe127b96e8f6933456118d44184108..206a5c6bf6f3228fa790f097e842feea59bc377e 100644
--- a/ui/aura/monitor_manager.cc
+++ b/ui/aura/monitor_manager.cc
@@ -7,32 +7,32 @@
 #include <stdio.h>
 
 #include "base/logging.h"
+#include "ui/aura/display_observer.h"
 #include "ui/aura/env.h"
-#include "ui/aura/monitor_observer.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_host.h"
-#include "ui/gfx/monitor.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"
 
 namespace aura {
 namespace {
 // Default bounds for a monitor.
-static const int kDefaultHostWindowX = 200;
-static const int kDefaultHostWindowY = 200;
-static const int kDefaultHostWindowWidth = 1280;
-static const int kDefaultHostWindowHeight = 1024;
+const int kDefaultHostWindowX = 200;
+const int kDefaultHostWindowY = 200;
+const int kDefaultHostWindowWidth = 1280;
+const int kDefaultHostWindowHeight = 1024;
 }  // namespace
 
 // static
 bool MonitorManager::use_fullscreen_host_window_ = false;
 
 // static
-gfx::Monitor MonitorManager::CreateMonitorFromSpec(const std::string& spec) {
+gfx::Display MonitorManager::CreateMonitorFromSpec(const std::string& spec) {
   static int synthesized_monitor_id = 1000;
   gfx::Rect bounds(kDefaultHostWindowX, kDefaultHostWindowY,
                    kDefaultHostWindowWidth, kDefaultHostWindowHeight);
   int x = 0, y = 0, width, height;
-  float scale = gfx::Monitor::GetDefaultDeviceScaleFactor();
+  float scale = gfx::Display::GetDefaultDeviceScaleFactor();
   if (sscanf(spec.c_str(), "%dx%d*%f", &width, &height, &scale) >= 2) {
     bounds.set_size(gfx::Size(width, height));
   } else if (sscanf(spec.c_str(), "%d+%d-%dx%d*%f", &x, &y, &width, &height,
@@ -41,10 +41,10 @@ gfx::Monitor MonitorManager::CreateMonitorFromSpec(const std::string& spec) {
   } else if (use_fullscreen_host_window_) {
     bounds = gfx::Rect(aura::RootWindowHost::GetNativeScreenSize());
   }
-  gfx::Monitor monitor(synthesized_monitor_id++);
-  monitor.SetScaleAndBounds(scale, bounds);
-  DVLOG(1) << "Monitor bounds=" << bounds.ToString() << ", scale=" << scale;
-  return monitor;
+  gfx::Display display(synthesized_monitor_id++);
+  display.SetScaleAndBounds(scale, bounds);
+  DVLOG(1) << "Display bounds=" << bounds.ToString() << ", scale=" << scale;
+  return display;
 }
 
 // static
@@ -63,27 +63,25 @@ MonitorManager::MonitorManager() {
 MonitorManager::~MonitorManager() {
 }
 
-void MonitorManager::AddObserver(MonitorObserver* observer) {
+void MonitorManager::AddObserver(DisplayObserver* observer) {
   observers_.AddObserver(observer);
 }
 
-void MonitorManager::RemoveObserver(MonitorObserver* observer) {
+void MonitorManager::RemoveObserver(DisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void MonitorManager::NotifyBoundsChanged(const gfx::Monitor& monitor) {
-  FOR_EACH_OBSERVER(MonitorObserver, observers_,
-                    OnMonitorBoundsChanged(monitor));
+void MonitorManager::NotifyBoundsChanged(const gfx::Display& display) {
+  FOR_EACH_OBSERVER(DisplayObserver, observers_,
+                    OnDisplayBoundsChanged(display));
 }
 
-void MonitorManager::NotifyMonitorAdded(const gfx::Monitor& monitor) {
-  FOR_EACH_OBSERVER(MonitorObserver, observers_,
-                    OnMonitorAdded(monitor));
+void MonitorManager::NotifyDisplayAdded(const gfx::Display& display) {
+  FOR_EACH_OBSERVER(DisplayObserver, observers_, OnDisplayAdded(display));
 }
 
-void MonitorManager::NotifyMonitorRemoved(const gfx::Monitor& monitor) {
-  FOR_EACH_OBSERVER(MonitorObserver, observers_,
-                    OnMonitorRemoved(monitor));
+void MonitorManager::NotifyDisplayRemoved(const gfx::Display& display) {
+  FOR_EACH_OBSERVER(DisplayObserver, observers_, OnDisplayRemoved(display));
 }
 
 }  // namespace aura