Fix namespace for src/ui/display/.

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 <memory>
 #include <utility>
 #include <vector>
@@ skipping 20 matching lines @@
 class FocusClient;
 }
 }
 
 namespace chromeos {
 class AudioA11yController;
 }
 
 namespace display {
 class DisplayChangeObserver;
+class DisplayConfigurator;
 class DisplayManager;
 }
 
 namespace gfx {
 class Insets;
 }
 
 namespace ui {
-class DisplayConfigurator;
 class UserActivityDetector;
 class UserActivityPowerManagerNotifier;
 }
+
 namespace views {
 class NonClientFrameView;
 class Widget;
 namespace corewm {
 class TooltipController;
 }
 }
 
 namespace wm {
 class AcceleratorFilter;
@@ skipping 259 matching lines @@
   // Made available for tests.
   ::wm::ShadowController* shadow_controller() {
     return shadow_controller_.get();
   }
 
   // Starts the animation that occurs on first login.
   void DoInitialWorkspaceAnimation();
 
 #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() {
     return display_error_observer_.get();
   }
 
   ScreenLayoutObserver* screen_layout_observer() {
     return screen_layout_observer_.get();
   }
 
@@ skipping 144 matching lines @@
   std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
   std::unique_ptr<VideoActivityNotifier> video_activity_notifier_;
   std::unique_ptr<StickyKeysController> sticky_keys_controller_;
   std::unique_ptr<ResolutionNotificationController>
       resolution_notification_controller_;
   std::unique_ptr<BluetoothNotificationController>
       bluetooth_notification_controller_;
   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_;
 
   // Listens for output changes and updates the display manager.
   std::unique_ptr<display::DisplayChangeObserver> display_change_observer_;
 
   // Listens for shutdown and updates DisplayConfigurator.
   std::unique_ptr<ShutdownObserver> shutdown_observer_;
 
@@ skipping 27 matching lines @@
   std::unique_ptr<GPUSupport> gpu_support_;
 
   std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_