Renamed OutputConfigurator to DisplayConfigurator

ash/touch/touch_observer_hud.cc

Index: ash/touch/touch_observer_hud.cc
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc
index 81908ab8765790243b42e08e78182f9dd55b098f..60924a517b4d7298796c3aca8c2c48344ca5bf10 100644
--- a/ash/touch/touch_observer_hud.cc
+++ b/ash/touch/touch_observer_hud.cc
@@ -48,7 +48,7 @@ TouchObserverHUD::TouchObserverHUD(aura::Window* initial_root)
   // Observe changes in display size and mode to update touch HUD.
   Shell::GetScreen()->AddObserver(this);
 #if defined(OS_CHROMEOS)
-  Shell::GetInstance()->output_configurator()->AddObserver(this);
+  Shell::GetInstance()->display_configurator()->AddObserver(this);
 #endif  // defined(OS_CHROMEOS)
 
   Shell::GetInstance()->display_controller()->AddObserver(this);
@@ -59,7 +59,7 @@ TouchObserverHUD::~TouchObserverHUD() {
   Shell::GetInstance()->display_controller()->RemoveObserver(this);
 
 #if defined(OS_CHROMEOS)
-  Shell::GetInstance()->output_configurator()->RemoveObserver(this);
+  Shell::GetInstance()->display_configurator()->RemoveObserver(this);
 #endif  // defined(OS_CHROMEOS)
   Shell::GetScreen()->RemoveObserver(this);
 
@@ -102,7 +102,7 @@ void TouchObserverHUD::OnDisplayRemoved(const gfx::Display& old_display) {
 
 #if defined(OS_CHROMEOS)
 void TouchObserverHUD::OnDisplayModeChanged(
-    const ui::OutputConfigurator::DisplayStateList& outputs) {
+    const ui::DisplayConfigurator::DisplayStateList& outputs) {
   // Clear touch HUD for any change in display mode (single, dual extended, dual
   // mirrored, ...).
   Clear();