Fix namespace for src/ui/display/.

ui/display/manager/display_manager.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 UI_DISPLAY_MANAGER_DISPLAY_MANAGER_H_
 #define UI_DISPLAY_MANAGER_DISPLAY_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 32 matching lines @@
 class Screen;
 
 namespace test {
 class DisplayManagerTestApi;
 }
 
 // DisplayManager maintains the current display configurations,
 // and notifies observers when configuration changes.
 class DISPLAY_MANAGER_EXPORT DisplayManager
 #if defined(OS_CHROMEOS)
-    : public ui::DisplayConfigurator::SoftwareMirroringController
+    : public DisplayConfigurator::SoftwareMirroringController
 #endif
 {
  public:
   class DISPLAY_MANAGER_EXPORT Delegate {
    public:
     virtual ~Delegate() {}
 
     // Create or updates the mirroring window with |display_info_list|.
     virtual void CreateOrUpdateMirroringDisplay(
         const DisplayInfoList& display_info_list) = 0;
 
     // Closes the mirror window if not necessary.
     virtual void CloseMirroringDisplayIfNotNecessary() = 0;
 
     // Called before and after the display configuration changes.  When
     // |clear_focus| is true, the implementation should deactivate the active
     // window and set the focus window to NULL.
     virtual void PreDisplayConfigurationChange(bool clear_focus) = 0;
     virtual void PostDisplayConfigurationChange(bool must_clear_window) = 0;
 
 #if defined(OS_CHROMEOS)
-    // Get the ui::DisplayConfigurator.
-    virtual ui::DisplayConfigurator* display_configurator() = 0;
+    // Get the DisplayConfigurator.
+    virtual DisplayConfigurator* display_configurator() = 0;
 #endif
   };
 
   // How the second display will be used.
   // 1) EXTENDED mode extends the desktop to the second dislpay.
   // 2) MIRRORING mode copies the content of the primary display to
   //    the 2nd display. (Software Mirroring).
   // 3) UNIFIED mode creates single desktop across multiple displays.
   enum MultiDisplayMode {
     EXTENDED = 0,
@@ skipping 85 matching lines @@
   // |overscan_insets| is null if the display has no custom overscan insets.
   // |touch_calibration_data| is null if the display has no touch calibration
   // associated data.
   void RegisterDisplayProperty(
       int64_t display_id,
       Display::Rotation rotation,
       float ui_scale,
       const gfx::Insets* overscan_insets,
       const gfx::Size& resolution_in_pixels,
       float device_scale_factor,
-      ui::ColorCalibrationProfile color_profile,
+      ColorCalibrationProfile color_profile,
       const TouchCalibrationData* touch_calibration_data);
 
   // Register stored rotation properties for the internal display.
   void RegisterDisplayRotationProperties(bool rotation_lock,
                                          Display::Rotation rotation);
 
   // Returns the stored rotation lock preference if it has been loaded,
   // otherwise false.
   bool registered_internal_display_rotation_lock() const {
     return registered_internal_display_rotation_lock_;
@@ skipping 17 matching lines @@
   // Tells if the virtual resolution feature is enabled.
   bool IsDisplayUIScalingEnabled() const;
 
   // Returns the current overscan insets for the specified |display_id|.
   // Returns an empty insets (0, 0, 0, 0) if no insets are specified for the
   // display.
   gfx::Insets GetOverscanInsets(int64_t display_id) const;
 
   // Sets the color calibration of the display to |profile|.
   void SetColorCalibrationProfile(int64_t display_id,
-                                  ui::ColorCalibrationProfile profile);
+                                  ColorCalibrationProfile profile);
 
   // Called when display configuration has changed. The new display
   // configurations is passed as a vector of Display object, which contains each
   // display's new infomration.
   void OnNativeDisplaysChanged(
       const std::vector<ManagedDisplayInfo>& display_info_list);
 
   // Updates the internal display data and notifies observers about the changes.
   void UpdateDisplaysWith(
       const std::vector<ManagedDisplayInfo>& display_info_list);
@@ skipping 243 matching lines @@
   base::ObserverList<DisplayObserver> observers_;
 
   base::WeakPtrFactory<DisplayManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace display
 
 #endif  // UI_DISPLAY_MANAGER_DISPLAY_MANAGER_H_