| Index: ui/ozone/platform/dri/native_display_delegate_dri.h
|
| diff --git a/ui/ozone/platform/dri/native_display_delegate_dri.h b/ui/ozone/platform/dri/native_display_delegate_dri.h
|
| index 70abb7b9163e776c12c6fedf0df8c9e3bdec2ebf..fc2005465f4003c8d3994ecdb650cee31ba422d0 100644
|
| --- a/ui/ozone/platform/dri/native_display_delegate_dri.h
|
| +++ b/ui/ozone/platform/dri/native_display_delegate_dri.h
|
| @@ -33,34 +33,34 @@ class NativeDisplayDelegateDri : public NativeDisplayDelegate,
|
| float refresh_rate);
|
|
|
| // 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<ui::ColorCalibrationProfile>
|
| GetAvailableColorCalibrationProfiles(
|
| - const ui::DisplaySnapshot& output) OVERRIDE;
|
| + const ui::DisplaySnapshot& output) override;
|
| virtual bool SetColorCalibrationProfile(
|
| const ui::DisplaySnapshot& output,
|
| - ui::ColorCalibrationProfile new_profile) OVERRIDE;
|
| - virtual void AddObserver(NativeDisplayObserver* observer) OVERRIDE;
|
| - virtual void RemoveObserver(NativeDisplayObserver* observer) OVERRIDE;
|
| + ui::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;
|
|
|
| private:
|
| // Notify ScreenManager of all the displays that were present before the
|
|
|