Fix namespace for src/ui/display/.

ui/ozone/platform/drm/host/drm_display_host_manager.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_HOST_DRM_DISPLAY_HOST_MANAGER_H_
 #define UI_OZONE_PLATFORM_DRM_HOST_DRM_DISPLAY_HOST_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 30 matching lines @@
   DrmDisplayHostManager(GpuThreadAdapter* proxy,
                         DeviceManager* device_manager,
                         InputControllerEvdev* input_controller);
   ~DrmDisplayHostManager() override;
 
   DrmDisplayHost* GetDisplay(int64_t display_id);
 
   // External API.
   void AddDelegate(DrmNativeDisplayDelegate* delegate);
   void RemoveDelegate(DrmNativeDisplayDelegate* delegate);
-  void TakeDisplayControl(const DisplayControlCallback& callback);
-  void RelinquishDisplayControl(const DisplayControlCallback& callback);
-  void UpdateDisplays(const GetDisplaysCallback& callback);
+  void TakeDisplayControl(const display::DisplayControlCallback& callback);
+  void RelinquishDisplayControl(
+      const display::DisplayControlCallback& callback);
+  void UpdateDisplays(const display::GetDisplaysCallback& callback);
 
   // DeviceEventObserver overrides:
   void OnDeviceEvent(const DeviceEvent& event) override;
 
   // GpuThreadObserver overrides:
   void OnGpuProcessLaunched() override;
   void OnGpuThreadReady() override;
   void OnGpuThreadRetired() override;
 
   // Communication-free implementations of actions performed in response to
   // messages from the GPU thread.
   void GpuHasUpdatedNativeDisplays(
       const std::vector<DisplaySnapshot_Params>& displays);
   void GpuConfiguredDisplay(int64_t display_id, bool status);
-  void GpuReceivedHDCPState(int64_t display_id, bool status, HDCPState state);
+  void GpuReceivedHDCPState(int64_t display_id,
+                            bool status,
+                            display::HDCPState state);
   void GpuUpdatedHDCPState(int64_t display_id, bool status);
   void GpuTookDisplayControl(bool status);
   void GpuRelinquishedDisplayControl(bool status);
 
  private:
   struct DisplayEvent {
     DisplayEvent(DeviceEvent::ActionType action_type,
                  const base::FilePath& path)
         : action_type(action_type), path(path) {}
 
     DeviceEvent::ActionType action_type;
     base::FilePath path;
   };
 
   // Handle hotplug events sequentially.
   void ProcessEvent();
 
   // Called as a result of finishing to process the display hotplug event. These
   // are responsible for dequing the event and scheduling the next event.
   void OnAddGraphicsDevice(const base::FilePath& path,
                            const base::FilePath& sysfs_path,
                            std::unique_ptr<DrmDeviceHandle> handle);
   void OnUpdateGraphicsDevice();
   void OnRemoveGraphicsDevice(const base::FilePath& path);
 
-  void RunUpdateDisplaysCallback(const GetDisplaysCallback& callback) const;
+  void RunUpdateDisplaysCallback(
+      const display::GetDisplaysCallback& callback) const;
 
   void NotifyDisplayDelegate() const;
 
   GpuThreadAdapter* proxy_;                 // Not owned.
   DeviceManager* device_manager_;           // Not owned.
   InputControllerEvdev* input_controller_;  // Not owned.
 
   DrmNativeDisplayDelegate* delegate_ = nullptr;  // Not owned.
 
   // File path for the primary graphics card which is opened by default in the
   // GPU process. We'll avoid opening this in hotplug events since it will race
   // with the GPU process trying to open it and aquire DRM master.
   base::FilePath primary_graphics_card_path_;
 
   // Keeps track if there is a dummy display. This happens on initialization
   // when there is no connection to the GPU to update the displays.
   bool has_dummy_display_ = false;
 
   std::vector<std::unique_ptr<DrmDisplayHost>> displays_;
 
-  GetDisplaysCallback get_displays_callback_;
+  display::GetDisplaysCallback get_displays_callback_;
 
   bool display_externally_controlled_ = false;
   bool display_control_change_pending_ = false;
-  DisplayControlCallback take_display_control_callback_;
-  DisplayControlCallback relinquish_display_control_callback_;
+  display::DisplayControlCallback take_display_control_callback_;
+  display::DisplayControlCallback relinquish_display_control_callback_;
 
   // Used to serialize display event processing. This is done since
   // opening/closing DRM devices cannot be done on the UI thread and are handled
   // on a worker thread. Thus, we need to queue events in order to process them
   // in the correct order.
   std::queue<DisplayEvent> event_queue_;
 
   // True if a display event is currently being processed on a worker thread.
   bool task_pending_ = false;
 
   // Keeps track of all the active DRM devices. The key is the device path, the
   // value is the sysfs path which has been resolved from the device path.
   std::map<base::FilePath, base::FilePath> drm_devices_;
 
   // This is used to cache the primary DRM device until the channel is
   // established.
   std::unique_ptr<DrmDeviceHandle> primary_drm_device_handle_;
 
   base::WeakPtrFactory<DrmDisplayHostManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DrmDisplayHostManager);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_HOST_DRM_DISPLAY_HOST_MANAGER_H_