Renamed OutputConfigurator to DisplayConfigurator

ash/display/display_change_observer_chromeos.h

Index: ash/display/display_change_observer_chromeos.h
diff --git a/ash/display/display_change_observer_chromeos.h b/ash/display/display_change_observer_chromeos.h
index c1675c399fc7a3967bc3b69360a44a49a507f386..707c37f01c993f7c58e8de2c159618324cfd6cdb 100644
--- a/ash/display/display_change_observer_chromeos.h
+++ b/ash/display/display_change_observer_chromeos.h
@@ -8,7 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
 #include "base/basictypes.h"
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 
 namespace ash {
 
@@ -16,26 +16,26 @@ struct DisplayMode;
 
 // An object that observes changes in display configuration and
 // update DisplayManagers.
-class DisplayChangeObserver : public ui::OutputConfigurator::StateController,
-                              public ui::OutputConfigurator::Observer,
+class DisplayChangeObserver : public ui::DisplayConfigurator::StateController,
+                              public ui::DisplayConfigurator::Observer,
                               public ShellObserver {
  public:
   // Returns the resolution list.
   ASH_EXPORT static std::vector<DisplayMode> GetDisplayModeList(
-      const ui::OutputConfigurator::DisplayState& output);
+      const ui::DisplayConfigurator::DisplayState& output);
 
   DisplayChangeObserver();
   virtual ~DisplayChangeObserver();
 
-  // ui::OutputConfigurator::StateController overrides:
+  // ui::DisplayConfigurator::StateController overrides:
   virtual ui::OutputState GetStateForDisplayIds(
       const std::vector<int64>& outputs) const OVERRIDE;
   virtual bool GetResolutionForDisplayId(int64 display_id,
                                          gfx::Size* size) const OVERRIDE;
 
-  // Overriden from ui::OutputConfigurator::Observer:
+  // Overriden from ui::DisplayConfigurator::Observer:
   virtual void OnDisplayModeChanged(
-      const ui::OutputConfigurator::DisplayStateList& outputs) OVERRIDE;
+      const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE;
 
   // Overriden from ShellObserver:
   virtual void OnAppTerminating() OVERRIDE;