diff options
| author | mostynb <mostynb@opera.com> | 2014-10-09 03:54:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-09 10:55:07 +0000 |
| commit | 3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6 (patch) | |
| tree | 720b6c8d126123e087abffedaedd8a9fa4907132 /ui/gfx/platform_font_win.h | |
| parent | 002d02909368b7067cc3df9149c5e46ce445861c (diff) | |
| download | chromium_src-3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6.zip chromium_src-3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6.tar.gz chromium_src-3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in ui/
BUG=417463
Review URL: https://codereview.chromium.org/623293004
Cr-Commit-Position: refs/heads/master@{#298839}
Diffstat (limited to 'ui/gfx/platform_font_win.h')
| -rw-r--r-- | ui/gfx/platform_font_win.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ui/gfx/platform_font_win.h b/ui/gfx/platform_font_win.h index 1434fe6..90160aa 100644 --- a/ui/gfx/platform_font_win.h +++ b/ui/gfx/platform_font_win.h @@ -54,17 +54,17 @@ class GFX_EXPORT PlatformFontWin : public PlatformFont { Font DeriveFontWithHeight(int height, int style); // 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: virtual ~PlatformFontWin() {} |