| Index: ui/display/chromeos/x11/native_display_delegate_x11.h
|
| diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.h b/ui/display/chromeos/x11/native_display_delegate_x11.h
|
| index c5f528161c80e13bffbc3258aa9a8e7e0216e68e..09bf22f1037df5a7405ebef4664d31f1e23a0e65 100644
|
| --- a/ui/display/chromeos/x11/native_display_delegate_x11.h
|
| +++ b/ui/display/chromeos/x11/native_display_delegate_x11.h
|
| @@ -66,37 +66,32 @@ class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate {
|
| };
|
|
|
| NativeDisplayDelegateX11();
|
| - virtual ~NativeDisplayDelegateX11();
|
| + ~NativeDisplayDelegateX11() override;
|
|
|
| // NativeDisplayDelegate overrides:
|
| - virtual void Initialize() override;
|
| - virtual void GrabServer() override;
|
| - virtual void UngrabServer() override;
|
| - virtual bool TakeDisplayControl() override;
|
| - virtual bool RelinquishDisplayControl() override;
|
| - virtual void SyncWithServer() override;
|
| - virtual void SetBackgroundColor(uint32_t color_argb) override;
|
| - virtual void ForceDPMSOn() override;
|
| - virtual void GetDisplays(const GetDisplaysCallback& callback) override;
|
| - virtual void AddMode(const DisplaySnapshot& output,
|
| - const DisplayMode* mode) override;
|
| - virtual void Configure(const DisplaySnapshot& output,
|
| - const DisplayMode* mode,
|
| - const gfx::Point& origin,
|
| - const ConfigureCallback& callback) override;
|
| - virtual void CreateFrameBuffer(const gfx::Size& size) override;
|
| - virtual bool GetHDCPState(const DisplaySnapshot& output,
|
| - HDCPState* state) override;
|
| - virtual bool SetHDCPState(const DisplaySnapshot& output,
|
| - HDCPState state) override;
|
| - virtual std::vector<ColorCalibrationProfile>
|
| - GetAvailableColorCalibrationProfiles(
|
| - 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;
|
| + void Initialize() override;
|
| + void GrabServer() override;
|
| + void UngrabServer() override;
|
| + bool TakeDisplayControl() override;
|
| + bool RelinquishDisplayControl() override;
|
| + void SyncWithServer() override;
|
| + void SetBackgroundColor(uint32_t color_argb) override;
|
| + void ForceDPMSOn() override;
|
| + void GetDisplays(const GetDisplaysCallback& callback) override;
|
| + void AddMode(const DisplaySnapshot& output, const DisplayMode* mode) override;
|
| + void Configure(const DisplaySnapshot& output,
|
| + const DisplayMode* mode,
|
| + const gfx::Point& origin,
|
| + const ConfigureCallback& callback) override;
|
| + void CreateFrameBuffer(const gfx::Size& size) override;
|
| + bool GetHDCPState(const DisplaySnapshot& output, HDCPState* state) override;
|
| + bool SetHDCPState(const DisplaySnapshot& output, HDCPState state) override;
|
| + std::vector<ColorCalibrationProfile> GetAvailableColorCalibrationProfiles(
|
| + const DisplaySnapshot& output) override;
|
| + bool SetColorCalibrationProfile(const DisplaySnapshot& output,
|
| + ColorCalibrationProfile new_profile) override;
|
| + void AddObserver(NativeDisplayObserver* observer) override;
|
| + void RemoveObserver(NativeDisplayObserver* observer) override;
|
|
|
| private:
|
| class HelperDelegateX11;
|
|
|