Relanding r144499:

Rename the remaining usage of Monitor to Display

BUG=none
TEST=none

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=144499

Review URL: https://chromiumcodereview.appspot.com/10675011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144585 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 10 deletions

diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index dff9498..9870c9e 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -103,8 +103,8 @@
         'dbus/sms_client.h',
         'dbus/update_engine_client.cc',
         'dbus/update_engine_client.h',
-        'monitor/output_configurator.cc',
-        'monitor/output_configurator.h',
+        'display/output_configurator.cc',
+        'display/output_configurator.h',
         'network/network_sms_handler.cc',
         'network/network_sms_handler.h',
       ],
diff --git a/chromeos/monitor/DEPS b/chromeos/display/DEPS
index d6abdda..d6abdda 100644
--- a/chromeos/monitor/DEPS
+++ b/chromeos/display/DEPS
diff --git a/chromeos/monitor/output_configurator.cc b/chromeos/display/output_configurator.cc
index 8e47f07..4543a52 100644
--- a/chromeos/monitor/output_configurator.cc
+++ b/chromeos/display/output_configurator.cc
@@ -2,7 +2,7 @@
 // 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>
@@ -37,15 +37,15 @@ 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
diff --git a/chromeos/monitor/output_configurator.h b/chromeos/display/output_configurator.h
index b98bcb4..2b6d2d4 100644
--- a/chromeos/monitor/output_configurator.h
+++ b/chromeos/display/output_configurator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_MONITOR_OUTPUT_CONFIGURATOR_H_
-#define CHROMEOS_MONITOR_OUTPUT_CONFIGURATOR_H_
+#ifndef CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_
+#define CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -42,7 +42,7 @@ struct CachedOutputDescription {
   unsigned long mm_height;
 };
 
-// Used to describe the state of a multi-monitor configuration.
+// Used to describe the state of a multi-display configuration.
 enum State {
   STATE_INVALID,
   STATE_HEADLESS,
@@ -162,4 +162,4 @@ class CHROMEOS_EXPORT OutputConfigurator : public MessageLoop::Dispatcher {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_MONITOR_OUTPUT_CONFIGURATOR_H_
+#endif  // CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_