Fix namespace for src/ui/display/.

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index c36f994285413f147a4d22540127e704aa051b26..d1804bfd3e8d5133360a2f7ea88d7ef2e9e4c2f9 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -40,6 +40,7 @@ class AudioA11yController;
 
 namespace display {
 class DisplayChangeObserver;
+class DisplayConfigurator;
 class DisplayManager;
 }
 
@@ -48,10 +49,10 @@ class Rect;
 }
 
 namespace ui {
-class DisplayConfigurator;
 class UserActivityDetector;
 class UserActivityPowerManagerNotifier;
 }
+
 namespace views {
 class NonClientFrameView;
 class Widget;
@@ -331,7 +332,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
 
 #if defined(OS_CHROMEOS)
   // TODO(oshima): Move these objects to WindowTreeHostManager.
-  ui::DisplayConfigurator* display_configurator() {
+  display::DisplayConfigurator* display_configurator() {
     return display_configurator_.get();
   }
   DisplayErrorObserver* display_error_observer() {
@@ -500,7 +501,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
   std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_;
   // Controls video output device state.
-  std::unique_ptr<ui::DisplayConfigurator> display_configurator_;
+  std::unique_ptr<display::DisplayConfigurator> display_configurator_;
   std::unique_ptr<DisplayColorManager> display_color_manager_;
   std::unique_ptr<DisplayErrorObserver> display_error_observer_;
   std::unique_ptr<ProjectingObserver> projecting_observer_;