Renamed OutputConfigurator to DisplayConfigurator

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 34 matching lines @@
 class ImageSkia;
 class Point;
 class Rect;
 }
 
 namespace keyboard {
 class KeyboardController;
 }
 
 namespace ui {
+class DisplayConfigurator;
 class Layer;
-class OutputConfigurator;
 }
 namespace views {
 class NonClientFrameView;
 class Widget;
 namespace corewm {
 class TooltipController;
 }
 }
 
 namespace wm {
@@ skipping 429 matching lines @@
   AccelerometerController* accelerometer_controller() {
     return accelerometer_controller_.get();
   }
 
   MaximizeModeController* maximize_mode_controller() {
     return maximize_mode_controller_.get();
   }
 
 #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();
   }
   DisplayErrorObserver* display_error_observer() {
     return display_error_observer_.get();
   }
 
   ResolutionNotificationController* resolution_notification_controller() {
     return resolution_notification_controller_.get();
@@ skipping 185 matching lines @@
   scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
   scoped_ptr<StickyKeysController> sticky_keys_controller_;
   scoped_ptr<ResolutionNotificationController>
       resolution_notification_controller_;
   scoped_ptr<BluetoothNotificationController>
       bluetooth_notification_controller_;
   scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_;
   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_;
 
   // Listens for output changes and updates the display manager.
   scoped_ptr<DisplayChangeObserver> display_change_observer_;
 
 #if defined(USE_X11)
   scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
   scoped_ptr<ui::EventHandler> speech_feedback_handler_;
@@ skipping 16 matching lines @@
 
   // Injected content::GPUDataManager support.
   scoped_ptr<GPUSupport> gpu_support_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_