Rename the remaining usage of Monitor to Display

chromeos/display/output_configurator.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 "chromeos/monitor/output_configurator.h"
+#include "chromeos/display/output_configurator.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/Xrandr.h>
 
 // Xlib defines Status as int which causes our include of dbus/bus.h to fail
 // when it tries to name an enum Status.  Thus, we need to undefine it (note
 // that this will cause a problem if code needs to use the Status type).
 // RootWindow causes similar problems in that there is a Chromium type with that
 // name.
@@ skipping 14 matching lines @@
 namespace chromeos {
 
 namespace {
 // DPI measurements.
 const float kMmInInch = 25.4;
 const float kDpi96 = 96.0;
 const float kPixelsToMmScale = kMmInInch / kDpi96;
 
 // The DPI threshold to detech high density screen.
 // Higher DPI than this will use device_scale_factor=2
-// Should be kept in sync with monitor_change_observer_x11.cc
+// Should be kept in sync with display_change_observer_x11.cc
 const unsigned int kHighDensityDIPThreshold = 160;
 
 // Prefixes for the built-in displays.
 const char kInternal_LVDS[] = "LVDS";
 const char kInternal_eDP[] = "eDP";
 
-// Gap between screens so cursor at bottom of active monitor doesn't partially
-// appear on top of inactive monitor. Higher numbers guard against larger
+// Gap between screens so cursor at bottom of active display doesn't partially
+// appear on top of inactive display. Higher numbers guard against larger
 // cursors, but also waste more memory. We will double this gap for screens
 // with a device_scale_factor of 2. While this gap will not guard against all
 // possible cursors in X, it should handle the ones we actually use. See
 // crbug.com/130188
 const int kVerticalGap = 30;
 
 // TODO: Determine if we need to organize modes in a way which provides better
 // than O(n) lookup time.  In many call sites, for example, the "next" mode is
 // typically what we are looking for so using this helper might be too
 // expensive.
@@ skipping 736 matching lines @@
       power_manager::kSetIsProjectingMethod);
   dbus::MessageWriter writer(&method_call);
   writer.AppendBool(is_projecting);
   power_manager_proxy->CallMethod(
       &method_call,
       dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
       dbus::ObjectProxy::EmptyResponseCallback());
 }
 
 }  // namespace chromeos