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

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 57b9a143f9703e10706b1ec8078a8cbf6d7d226d..de6a198496074c2c04534da22dfa97743181385c 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -42,9 +42,6 @@ class ActivationClient;
 class FocusClient;
 }
 }
-namespace chromeos {
-class OutputConfigurator;
-}
 
 namespace gfx {
 class ImageSkia;
@@ -58,6 +55,7 @@ class KeyboardController;
 
 namespace ui {
 class Layer;
+class OutputConfigurator;
 }
 namespace views {
 class NonClientFrameView;
@@ -496,7 +494,7 @@ class ASH_EXPORT Shell
 #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() {
@@ -706,7 +704,7 @@ class ASH_EXPORT Shell
       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_;