ui/base/default_theme_provider.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/base/default_theme_provider.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/base/default_theme_provider.h

diff --git a/ui/base/default_theme_provider.h b/ui/base/default_theme_provider.h

index 8bf2a01cc0341008d0e080623d1456cafbe0cd50..0fe64d117fda10db973755f185a81dd888efad68 100644

--- a/ui/base/default_theme_provider.h

+++ b/ui/base/default_theme_provider.h

@@ -24,22 +24,22 @@ class UI_BASE_EXPORT DefaultThemeProvider : public ThemeProvider {

virtual ~DefaultThemeProvider();

// Overridden from ui::ThemeProvider:

- virtual bool UsingSystemTheme() const OVERRIDE;

- virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;

- virtual SkColor GetColor(int id) const OVERRIDE;

- virtual int GetDisplayProperty(int id) const OVERRIDE;

- virtual bool ShouldUseNativeFrame() const OVERRIDE;

- virtual bool HasCustomImage(int id) const OVERRIDE;

+ virtual bool UsingSystemTheme() const override;

+ virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const override;

+ virtual SkColor GetColor(int id) const override;

+ virtual int GetDisplayProperty(int id) const override;

+ virtual bool ShouldUseNativeFrame() const override;

+ virtual bool HasCustomImage(int id) const override;

virtual base::RefCountedMemory* GetRawData(

int id,

- ui::ScaleFactor scale_factor) const OVERRIDE;

+ ui::ScaleFactor scale_factor) const override;

#if defined(OS_MACOSX)

- virtual NSImage* GetNSImageNamed(int id) const OVERRIDE;

- virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE;

- virtual NSColor* GetNSColor(int id) const OVERRIDE;

- virtual NSColor* GetNSColorTint(int id) const OVERRIDE;

- virtual NSGradient* GetNSGradient(int id) const OVERRIDE;

+ virtual NSImage* GetNSImageNamed(int id) const override;

+ virtual NSColor* GetNSImageColorNamed(int id) const override;

+ virtual NSColor* GetNSColor(int id) const override;

+ virtual NSColor* GetNSColorTint(int id) const override;

+ virtual NSGradient* GetNSGradient(int id) const override;

#endif

private:

« no previous file with comments | « ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h ('k') | ui/base/dragdrop/drag_utils.cc » ('j') | no next file with comments »