Fix namespace for src/ui/display/.

ui/ozone/platform/drm/gpu/drm_device.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_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_H_
 #define UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/overlay_transform.h"
 #include "ui/ozone/platform/drm/common/scoped_drm_types.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
 
 typedef struct _drmEventContext drmEventContext;
 typedef struct _drmModeModeInfo drmModeModeInfo;
 
 struct SkImageInfo;
 
+namespace display {
+struct GammaRampRGBEntry;
+}
+
 namespace ui {
 
 class HardwareDisplayPlaneManager;
-struct GammaRampRGBEntry;
 
 // Wraps DRM calls into a nice interface. Used to provide different
 // implementations of the DRM calls. For the actual implementation the DRM API
 // would be called. In unit tests this interface would be stubbed.
 class DrmDevice : public base::RefCountedThreadSafe<DrmDevice> {
  public:
   typedef base::Callback<void(unsigned int /* frame */,
                               unsigned int /* seconds */,
                               unsigned int /* useconds */)> PageFlipCallback;
 
@@ skipping 108 matching lines @@
 
   virtual bool CloseBufferHandle(uint32_t handle);
 
   virtual bool CommitProperties(drmModeAtomicReq* properties,
                                 uint32_t flags,
                                 uint32_t crtc_count,
                                 const PageFlipCallback& callback);
 
   virtual bool SetColorCorrection(
       uint32_t crtc_id,
-      const std::vector<GammaRampRGBEntry>& degamma_lut,
-      const std::vector<GammaRampRGBEntry>& gamma_lut,
+      const std::vector<display::GammaRampRGBEntry>& degamma_lut,
+      const std::vector<display::GammaRampRGBEntry>& gamma_lut,
       const std::vector<float>& correction_matrix);
 
   virtual bool SetCapability(uint64_t capability, uint64_t value);
 
   // Drm master related
   virtual bool SetMaster();
   virtual bool DropMaster();
 
   int get_fd() const { return file_.GetPlatformFile(); }
 
   base::FilePath device_path() const { return device_path_; }
 
   HardwareDisplayPlaneManager* plane_manager() { return plane_manager_.get(); }
 
  protected:
   friend class base::RefCountedThreadSafe<DrmDevice>;
 
   virtual ~DrmDevice();
 
   std::unique_ptr<HardwareDisplayPlaneManager> plane_manager_;
 
  private:
   class IOWatcher;
   class PageFlipManager;
 
   bool SetGammaRamp(uint32_t crtc_id,
-                    const std::vector<GammaRampRGBEntry>& lut);
+                    const std::vector<display::GammaRampRGBEntry>& lut);
 
   // Path to the DRM device (in sysfs).
   const base::FilePath device_path_;
 
   // DRM device.
   base::File file_;
 
   std::unique_ptr<PageFlipManager> page_flip_manager_;
 
   // Watcher for |fd_| listening for page flip events.
   std::unique_ptr<IOWatcher> watcher_;
 
   bool is_primary_device_;
 
   DISALLOW_COPY_AND_ASSIGN(DrmDevice);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_H_