Renamed OutputConfigurator to DisplayConfigurator

ui/display/chromeos/x11/touchscreen_delegate_x11.h

Index: ui/display/chromeos/x11/touchscreen_delegate_x11.h
diff --git a/ui/display/chromeos/x11/touchscreen_delegate_x11.h b/ui/display/chromeos/x11/touchscreen_delegate_x11.h
index 0d6ed8f504a5f151477ce746266563b545ec76ab..434f55fffedfac8e138c6860f1201c4aea113cf3 100644
--- a/ui/display/chromeos/x11/touchscreen_delegate_x11.h
+++ b/ui/display/chromeos/x11/touchscreen_delegate_x11.h
@@ -5,24 +5,24 @@
 #ifndef UI_DISPLAY_CHROMEOS_X11_TOUCHSCREEN_DELEGATE_X11_H_
 #define UI_DISPLAY_CHROMEOS_X11_TOUCHSCREEN_DELEGATE_X11_H_
 
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 
 struct _XDisplay;
 typedef struct _XDisplay Display;
 
 namespace ui {
 
-class TouchscreenDelegateX11 : public OutputConfigurator::TouchscreenDelegate {
+class TouchscreenDelegateX11 : public DisplayConfigurator::TouchscreenDelegate {
  public:
   TouchscreenDelegateX11();
   virtual ~TouchscreenDelegateX11();
 
-  // OutputConfigurator::TouchscreenDelegate implementation:
+  // DisplayConfigurator::TouchscreenDelegate implementation:
   virtual void AssociateTouchscreens(
-      OutputConfigurator::DisplayStateList* outputs) OVERRIDE;
+      DisplayConfigurator::DisplayStateList* outputs) OVERRIDE;
   virtual void ConfigureCTM(
       int touch_device_id,
-      const OutputConfigurator::CoordinateTransformation& ctm) OVERRIDE;
+      const DisplayConfigurator::CoordinateTransformation& ctm) OVERRIDE;
 
  private:
   Display* display_;