Fix namespace for src/ui/display/.

ui/display/manager/chromeos/x11/native_display_delegate_x11.h

 // Copyright 2014 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_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
 #define UI_DISPLAY_MANAGER_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 23 matching lines @@
 typedef _XRROutputInfo XRROutputInfo;
 struct _XRRScreenResources;
 typedef _XRRScreenResources XRRScreenResources;
 struct _XRRCrtcGamma;
 typedef _XRRCrtcGamma XRRCrtcGamma;
 
 extern "C" {
 void XRRFreeScreenResources(XRRScreenResources* resources);
 }
 
-namespace ui {
+namespace display {
 
 class DisplayModeX11;
 class DisplaySnapshotX11;
 class NativeDisplayEventDispatcherX11;
 
 class DISPLAY_MANAGER_EXPORT NativeDisplayDelegateX11
     : public NativeDisplayDelegate {
  public:
   // Helper class that allows NativeDisplayEventDispatcherX11 and
   // NativeDisplayDelegateX11::PlatformEventObserverX11 to interact with this
@@ skipping 36 matching lines @@
   void CreateFrameBuffer(const gfx::Size& size) override;
   void GetHDCPState(const DisplaySnapshot& output,
                     const GetHDCPStateCallback& callback) override;
   void SetHDCPState(const DisplaySnapshot& output,
                     HDCPState state,
                     const SetHDCPStateCallback& callback) override;
   std::vector<ColorCalibrationProfile> GetAvailableColorCalibrationProfiles(
       const DisplaySnapshot& output) override;
   bool SetColorCalibrationProfile(const DisplaySnapshot& output,
                                   ColorCalibrationProfile new_profile) override;
-  bool SetColorCorrection(const ui::DisplaySnapshot& output,
+  bool SetColorCorrection(const DisplaySnapshot& output,
                           const std::vector<GammaRampRGBEntry>& degamma_lut,
                           const std::vector<GammaRampRGBEntry>& gamma_lut,
                           const std::vector<float>& correction_matrix) override;
   void AddObserver(NativeDisplayObserver* observer) override;
   void RemoveObserver(NativeDisplayObserver* observer) override;
-  display::FakeDisplayController* GetFakeDisplayController() override;
+  FakeDisplayController* GetFakeDisplayController() override;
 
  private:
   class HelperDelegateX11;
 
   // Parses all the modes made available by |screen_|.
   void InitModes();
 
   // Helper method for GetOutputs() that returns an OutputSnapshot struct based
   // on the passed-in information.
   DisplaySnapshotX11* InitDisplaySnapshot(RROutput id,
@@ skipping 50 matching lines @@
 
   // List of observers waiting for display configuration change events.
   base::ObserverList<NativeDisplayObserver> observers_;
 
   // A background color used during boot time + multi displays.
   uint32_t background_color_argb_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11);
 };
 
-}  // namespace ui
+}  // namespace display
 
 #endif  // UI_DISPLAY_MANAGER_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_