Renamed OutputConfigurator to DisplayConfigurator

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index d506f876536919dd14b9b15372f719d2ea668a2a..b4cf9d52aace2cd53a1c35a748383dc613b3030c 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -52,8 +52,8 @@ class KeyboardController;
 }
 
 namespace ui {
+class DisplayConfigurator;
 class Layer;
-class OutputConfigurator;
 }
 namespace views {
 class NonClientFrameView;
@@ -503,8 +503,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
 
 #if defined(OS_CHROMEOS)
   // TODO(oshima): Move these objects to DisplayController.
-  ui::OutputConfigurator* output_configurator() {
-    return output_configurator_.get();
+  ui::DisplayConfigurator* display_configurator() {
+    return display_configurator_.get();
   }
   OutputConfiguratorAnimation* output_configurator_animation() {
     return output_configurator_animation_.get();
@@ -710,7 +710,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   scoped_ptr<LastWindowClosedLogoutReminder>
       last_window_closed_logout_reminder_;
   // Controls video output device state.
-  scoped_ptr<ui::OutputConfigurator> output_configurator_;
+  scoped_ptr<ui::DisplayConfigurator> display_configurator_;
   scoped_ptr<OutputConfiguratorAnimation> output_configurator_animation_;
   scoped_ptr<DisplayErrorObserver> display_error_observer_;
   scoped_ptr<ProjectingObserver> projecting_observer_;