Move chromeos/display/* to ui/display/chromeos

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 24 matching lines @@
 }
 namespace aura {
 class EventFilter;
 class RootWindow;
 class Window;
 namespace client {
 class ActivationClient;
 class FocusClient;
 }
 }
-namespace chromeos {
-class OutputConfigurator;
-}
 
 namespace gfx {
 class ImageSkia;
 class Point;
 class Rect;
 }
 
 namespace keyboard {
 class KeyboardController;
 }
 
 namespace ui {
 class Layer;
+class OutputConfigurator;
 }
 namespace views {
 class NonClientFrameView;
 class Widget;
 namespace corewm {
 class CompoundEventFilter;
 class InputMethodEventFilter;
 class ShadowController;
 class TooltipController;
 class VisibilityController;
@@ skipping 418 matching lines @@
   views::corewm::ShadowController* shadow_controller() {
     return shadow_controller_.get();
   }
 
   // Starts the animation that occurs on first login.
   void DoInitialWorkspaceAnimation();
 
 #if defined(OS_CHROMEOS)
 #if defined(USE_X11)
   // TODO(oshima): Move these objects to DisplayController.
-  chromeos::OutputConfigurator* output_configurator() {
+  ui::OutputConfigurator* output_configurator() {
     return output_configurator_.get();
   }
   internal::OutputConfiguratorAnimation* output_configurator_animation() {
     return output_configurator_animation_.get();
   }
   internal::DisplayErrorObserver* display_error_observer() {
     return display_error_observer_.get();
   }
 #endif  // defined(USE_X11)
 
@@ skipping 189 matching lines @@
   scoped_ptr<internal::VideoActivityNotifier> video_activity_notifier_;
   scoped_ptr<StickyKeysController> sticky_keys_controller_;
   scoped_ptr<internal::ResolutionNotificationController>
       resolution_notification_controller_;
   scoped_ptr<internal::BluetoothNotificationController>
       bluetooth_notification_controller_;
   scoped_ptr<internal::LogoutConfirmationController>
       logout_confirmation_controller_;
 #if defined(USE_X11)
   // Controls video output device state.
-  scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
+  scoped_ptr<ui::OutputConfigurator> output_configurator_;
   scoped_ptr<internal::OutputConfiguratorAnimation>
       output_configurator_animation_;
   scoped_ptr<internal::DisplayErrorObserver> display_error_observer_;
   scoped_ptr<internal::ProjectingObserver> projecting_observer_;
 
   // Listens for output changes and updates the display manager.
   scoped_ptr<internal::DisplayChangeObserver> display_change_observer_;
 
   scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
   scoped_ptr<ui::EventHandler> speech_feedback_handler_;
@@ skipping 14 matching lines @@
 
   // Injected content::GPUDataManager support.
   scoped_ptr<GPUSupport> gpu_support_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_