ui/gfx/platform_font_ios.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/gfx/platform_font_ios.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/gfx/platform_font_ios.h

diff --git a/ui/gfx/platform_font_ios.h b/ui/gfx/platform_font_ios.h

index 1d287c3940ff40474fe12a00c3dfdda825ebb072..bb0aeaa7f4f20fb3d009402b73ff61eb7f4340ca 100644

--- a/ui/gfx/platform_font_ios.h

+++ b/ui/gfx/platform_font_ios.h

@@ -17,17 +17,17 @@ class PlatformFontIOS : public PlatformFont {

int font_size);

// Overridden from PlatformFont:

- virtual Font DeriveFont(int size_delta, int style) const OVERRIDE;

- virtual int GetHeight() const OVERRIDE;

- virtual int GetBaseline() const OVERRIDE;

- virtual int GetCapHeight() const OVERRIDE;

- virtual int GetExpectedTextWidth(int length) const OVERRIDE;

- virtual int GetStyle() const OVERRIDE;

- virtual std::string GetFontName() const OVERRIDE;

- virtual std::string GetActualFontNameForTesting() const OVERRIDE;

- virtual int GetFontSize() const OVERRIDE;

- virtual const FontRenderParams& GetFontRenderParams() const OVERRIDE;

- virtual NativeFont GetNativeFont() const OVERRIDE;

+ virtual Font DeriveFont(int size_delta, int style) const override;

+ virtual int GetHeight() const override;

+ virtual int GetBaseline() const override;

+ virtual int GetCapHeight() const override;

+ virtual int GetExpectedTextWidth(int length) const override;

+ virtual int GetStyle() const override;

+ virtual std::string GetFontName() const override;

+ virtual std::string GetActualFontNameForTesting() const override;

+ virtual int GetFontSize() const override;

+ virtual const FontRenderParams& GetFontRenderParams() const override;

+ virtual NativeFont GetNativeFont() const override;

private:

PlatformFontIOS(const std::string& font_name, int font_size, int style);

« no previous file with comments | « ui/gfx/mac/coordinate_conversion_unittest.mm ('k') | ui/gfx/platform_font_mac.h » ('j') | no next file with comments »