Rename the remaining usage of Monitor to Display

chromeos/display/output_configurator.h

 // 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.
 
-#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"
 #include "base/event_types.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chromeos/chromeos_export.h"
 
 // Forward declarations for Xlib and Xrandr.
 // This is so unused X definitions don't pollute the namespace.
@@ skipping 18 matching lines @@
   RRMode ideal_mode;
   int x;
   int y;
   bool is_connected;
   bool is_powered_on;
   bool is_internal;
   unsigned long mm_width;
   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,
   STATE_SINGLE,
   STATE_DUAL_MIRROR,
   STATE_DUAL_PRIMARY_ONLY,
   STATE_DUAL_SECONDARY_ONLY,
 };
 
 // This class interacts directly with the underlying Xrandr API to manipulate
@@ skipping 99 matching lines @@
 
   // The display state as derived from the outputs observed in |output_cache_|.
   // This is used for rotating display modes.
   State output_state_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputConfigurator);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_MONITOR_OUTPUT_CONFIGURATOR_H_
+#endif  // CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_