| Index: ui/ozone/platform/dri/native_display_delegate_proxy.h
|
| diff --git a/ui/ozone/platform/dri/native_display_delegate_proxy.h b/ui/ozone/platform/dri/native_display_delegate_proxy.h
|
| index 098c51471c951260613574b2195c160b47997fb7..2dcf0e1723dd3195ce158af69d2ac2441d3110d0 100644
|
| --- a/ui/ozone/platform/dri/native_display_delegate_proxy.h
|
| +++ b/ui/ozone/platform/dri/native_display_delegate_proxy.h
|
| @@ -28,41 +28,41 @@ class NativeDisplayDelegateProxy : public NativeDisplayDelegate,
|
| virtual ~NativeDisplayDelegateProxy();
|
|
|
| // NativeDisplayDelegate overrides:
|
| - virtual void Initialize() OVERRIDE;
|
| - virtual void GrabServer() OVERRIDE;
|
| - virtual void UngrabServer() OVERRIDE;
|
| - virtual void SyncWithServer() OVERRIDE;
|
| - virtual void SetBackgroundColor(uint32_t color_argb) OVERRIDE;
|
| - virtual void ForceDPMSOn() OVERRIDE;
|
| - virtual std::vector<DisplaySnapshot*> GetDisplays() OVERRIDE;
|
| + virtual void Initialize() override;
|
| + virtual void GrabServer() override;
|
| + virtual void UngrabServer() override;
|
| + virtual void SyncWithServer() override;
|
| + virtual void SetBackgroundColor(uint32_t color_argb) override;
|
| + virtual void ForceDPMSOn() override;
|
| + virtual std::vector<DisplaySnapshot*> GetDisplays() override;
|
| virtual void AddMode(const DisplaySnapshot& output,
|
| - const DisplayMode* mode) OVERRIDE;
|
| + const DisplayMode* mode) override;
|
| virtual bool Configure(const DisplaySnapshot& output,
|
| const DisplayMode* mode,
|
| - const gfx::Point& origin) OVERRIDE;
|
| - virtual void CreateFrameBuffer(const gfx::Size& size) OVERRIDE;
|
| + const gfx::Point& origin) override;
|
| + virtual void CreateFrameBuffer(const gfx::Size& size) override;
|
| virtual bool GetHDCPState(const DisplaySnapshot& output,
|
| - HDCPState* state) OVERRIDE;
|
| + HDCPState* state) override;
|
| virtual bool SetHDCPState(const DisplaySnapshot& output,
|
| - HDCPState state) OVERRIDE;
|
| + HDCPState state) override;
|
| virtual std::vector<ColorCalibrationProfile>
|
| GetAvailableColorCalibrationProfiles(
|
| - const DisplaySnapshot& output) OVERRIDE;
|
| + const DisplaySnapshot& output) override;
|
| virtual bool SetColorCalibrationProfile(
|
| const DisplaySnapshot& output,
|
| - ColorCalibrationProfile new_profile) OVERRIDE;
|
| - virtual void AddObserver(NativeDisplayObserver* observer) OVERRIDE;
|
| - virtual void RemoveObserver(NativeDisplayObserver* observer) OVERRIDE;
|
| + ColorCalibrationProfile new_profile) override;
|
| + virtual void AddObserver(NativeDisplayObserver* observer) override;
|
| + virtual void RemoveObserver(NativeDisplayObserver* observer) override;
|
|
|
| // DeviceEventObserver overrides:
|
| - virtual void OnDeviceEvent(const DeviceEvent& event) OVERRIDE;
|
| + virtual void OnDeviceEvent(const DeviceEvent& event) override;
|
|
|
| // GpuPlatformSupportHost:
|
| - virtual void OnChannelEstablished(int host_id, IPC::Sender* sender) OVERRIDE;
|
| - virtual void OnChannelDestroyed(int host_id) OVERRIDE;
|
| + virtual void OnChannelEstablished(int host_id, IPC::Sender* sender) override;
|
| + virtual void OnChannelDestroyed(int host_id) override;
|
|
|
| // IPC::Listener overrides:
|
| - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
| + virtual bool OnMessageReceived(const IPC::Message& message) override;
|
|
|
| private:
|
| void OnUpdateNativeDisplays(
|
|
|