Renamed OutputConfigurator to DisplayConfigurator

ash/touch/touch_observer_hud.cc

 // 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.
 
 #include "ash/touch/touch_observer_hud.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 30 matching lines @@
   widget_->Init(params);
   widget_->SetContentsView(content);
   widget_->StackAtTop();
   widget_->Show();
 
   widget_->AddObserver(this);
 
   // 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);
   root_window_->AddPreTargetHandler(this);
 }
 
 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);
 
   widget_->RemoveObserver(this);
 }
 
 void TouchObserverHUD::Clear() {
 }
 
 void TouchObserverHUD::Remove() {
@@ skipping 22 matching lines @@
 void TouchObserverHUD::OnDisplayAdded(const gfx::Display& new_display) {}
 
 void TouchObserverHUD::OnDisplayRemoved(const gfx::Display& old_display) {
   if (old_display.id() != display_id_)
     return;
   widget_->CloseNow();
 }
 
 #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();
 }
 #endif  // defined(OS_CHROMEOS)
 
 void TouchObserverHUD::OnDisplaysInitialized() {
   OnDisplayConfigurationChanged();
 }
 
@@ skipping 25 matching lines @@
       widget_->GetNativeView(),
       Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer));
 
   RootWindowController* controller = GetRootWindowController(root_window_);
   SetHudForRootWindowController(controller);
 
   root_window_->AddPreTargetHandler(this);
 }
 
 }  // namespace ash