ui/ozone/common/native_display_delegate_ozone.h - Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/ozone/common/native_display_delegate_ozone.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase on master Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ui/ozone/common/native_display_delegate_ozone.h

diff --git a/ui/ozone/common/native_display_delegate_ozone.h b/ui/ozone/common/native_display_delegate_ozone.h

index 5507f9aeb1348ace58f7f721939feeb254a7dc08..e600ce5530c246577bb1a92bd3506f48cc817db0 100644

--- a/ui/ozone/common/native_display_delegate_ozone.h

+++ b/ui/ozone/common/native_display_delegate_ozone.h

@@ -16,31 +16,31 @@ class NativeDisplayDelegateOzone : public NativeDisplayDelegate {

virtual ~NativeDisplayDelegateOzone();

// 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<ui::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<ui::DisplaySnapshot*> GetDisplays() override;

virtual void AddMode(const ui::DisplaySnapshot& output,

- const ui::DisplayMode* mode) OVERRIDE;

+ const ui::DisplayMode* mode) override;

virtual bool Configure(const ui::DisplaySnapshot& output,

const ui::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 ui::DisplaySnapshot& output,

- ui::HDCPState* state) OVERRIDE;

+ ui::HDCPState* state) override;

virtual bool SetHDCPState(const ui::DisplaySnapshot& output,

- ui::HDCPState state) OVERRIDE;

+ ui::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;

private:

DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateOzone);

« no previous file with comments | « ui/ozone/common/display_snapshot_proxy.h ('k') | ui/ozone/demo/ozone_demo.cc » ('j') | no next file with comments »