Renamed OutputConfigurator to DisplayConfigurator

ash/touch/touch_observer_hud.h

Index: ash/touch/touch_observer_hud.h
diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h
index b3a237b4c66a1ff0487e2e0f56384fa689ba68c5..2bfbb0da54bd14eb92642d0ba12375473ee26fb8 100644
--- a/ash/touch/touch_observer_hud.h
+++ b/ash/touch/touch_observer_hud.h
@@ -12,7 +12,7 @@
 #include "ui/views/widget/widget_observer.h"
 
 #if defined(OS_CHROMEOS)
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace views {
@@ -27,7 +27,7 @@ class ASH_EXPORT TouchObserverHUD : public ui::EventHandler,
                                     public views::WidgetObserver,
                                     public gfx::DisplayObserver,
 #if defined(OS_CHROMEOS)
-                                    public ui::OutputConfigurator::Observer,
+                                    public ui::DisplayConfigurator::Observer,
 #endif  // defined(OS_CHROMEOS)
                                     public DisplayController::Observer {
  public:
@@ -64,9 +64,9 @@ class ASH_EXPORT TouchObserverHUD : public ui::EventHandler,
   virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
 
 #if defined(OS_CHROMEOS)
-  // 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;
 #endif  // defined(OS_CHROMEOS)
 
   // Overriden form DisplayController::Observer.