Rename the remaining usage of Monitor to Display

ui/aura/display_change_observer_x11.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/aura/monitor_change_observer_x11.h"
+#include "ui/aura/display_change_observer_x11.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
 #include <X11/extensions/Xrandr.h>
 
 #include "base/message_pump_aurax11.h"
 #include "ui/aura/dispatcher_linux.h"
 #include "ui/aura/env.h"
-#include "ui/aura/monitor_manager.h"
+#include "ui/aura/display_manager.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/display.h"
 
 namespace aura {
 namespace internal {
 
 namespace {
 
 // The DPI threshold to detect high density screen.
 // Higher DPI than this will use device_scale_factor=2.
 // Note: This value has to be kept in sync with the mouse/touchpad driver
 // which controls mouse pointer acceleration. If you need to update this value,
 // please update the bug (crosbug.com/31628) first and make sure that the
 // driver will use the same value.
 // This value also has to be kept in sync with the value in
-// chromeos/monitor/output_configurator.cc. See crbug.com/130188
+// chromeos/display/output_configurator.cc. See crbug.com/130188
 const unsigned int kHighDensityDIPThreshold = 160;
 
 // 1 inch in mm.
 const float kInchInMm = 25.4f;
 
 XRRModeInfo* FindMode(XRRScreenResources* screen_resources, XID current_mode) {
   for (int m = 0; m < screen_resources->nmode; m++) {
     XRRModeInfo *mode = &screen_resources->modes[m];
     if (mode->id == current_mode)
       return mode;
   }
   return NULL;
 }
 
 bool CompareDisplayY(const gfx::Display& lhs, const gfx::Display& rhs) {
   return lhs.bounds_in_pixel().y() < rhs.bounds_in_pixel().y();
 }
 
 }  // namespace
 
-MonitorChangeObserverX11::MonitorChangeObserverX11()
+DisplayChangeObserverX11::DisplayChangeObserverX11()
     : xdisplay_(base::MessagePumpAuraX11::GetDefaultXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       xrandr_event_base_(0) {
   int error_base_ignored;
   XRRQueryExtension(xdisplay_, &xrandr_event_base_, &error_base_ignored);
   static_cast<DispatcherLinux*>(Env::GetInstance()->GetDispatcher())->
       AddDispatcherForRootWindow(this);
 }
 
-MonitorChangeObserverX11::~MonitorChangeObserverX11() {
+DisplayChangeObserverX11::~DisplayChangeObserverX11() {
   static_cast<DispatcherLinux*>(Env::GetInstance()->GetDispatcher())->
       RemoveDispatcherForRootWindow(this);
 }
 
-bool MonitorChangeObserverX11::Dispatch(const base::NativeEvent& event) {
+bool DisplayChangeObserverX11::Dispatch(const base::NativeEvent& event) {
   if (event->type - xrandr_event_base_ == RRScreenChangeNotify) {
     NotifyDisplayChange();
   }
   return true;
 }
 
-void MonitorChangeObserverX11::NotifyDisplayChange() {
-  if (!MonitorManager::use_fullscreen_host_window())
-    return;  // Use the default monitor that monitor manager determined.
+void DisplayChangeObserverX11::NotifyDisplayChange() {
+  if (!DisplayManager::use_fullscreen_host_window())
+    return;  // Use the default display that display manager determined.
 
   XRRScreenResources* screen_resources =
       XRRGetScreenResources(xdisplay_, x_root_window_);
   std::map<XID, XRRCrtcInfo*> crtc_info_map;
 
   for (int c = 0; c < screen_resources->ncrtc; c++) {
     XID crtc_id = screen_resources->crtcs[c];
     XRRCrtcInfo *crtc_info =
         XRRGetCrtcInfo(xdisplay_, screen_resources, crtc_id);
     crtc_info_map[crtc_id] = crtc_info;
@@ skipping 16 matching lines @@
       continue;
     }
     XRRModeInfo* mode = FindMode(screen_resources, crtc_info->mode);
     if (!mode) {
       LOG(WARNING) << "Could not find a mode for the output: output=" << o;
       continue;
     }
     // Mirrored monitors have the same y coordinates.
     if (y_coords.find(crtc_info->y) != y_coords.end())
       continue;
-    // TODO(oshima): Create unique ID for the monitor.
+    // TODO(oshima): Create unique ID for the display.
     displays.push_back(gfx::Display(
         0,
         gfx::Rect(crtc_info->x, crtc_info->y, mode->width, mode->height)));
 
     float device_scale_factor = 1.0f;
     if (output_info->mm_width > 0 &&
         (kInchInMm * mode->width / output_info->mm_width) >
         kHighDensityDIPThreshold) {
       device_scale_factor = 2.0f;
     }
@@ skipping 11 matching lines @@
 
   // PowerManager lays out the outputs vertically. Sort them by Y
   // coordinates.
   std::sort(displays.begin(), displays.end(), CompareDisplayY);
   // TODO(oshima): Assisgn index as ID for now. Use unique ID.
   int id = 0;
   for (std::vector<gfx::Display>::iterator iter = displays.begin();
        iter != displays.end(); ++iter, ++id)
     (*iter).set_id(id);
 
-  Env::GetInstance()->monitor_manager()->OnNativeMonitorsChanged(displays);
+  Env::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
 }
 
 }  // namespace internal
 }  // namespace aura