Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Unified Diff: ui/gfx/platform_font_mac.h

Issue 667923002: Standardize usage of virtual/override/final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « ui/gfx/interpolated_transform.h ('k') | ui/gfx/render_text_harfbuzz.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/platform_font_mac.h
diff --git a/ui/gfx/platform_font_mac.h b/ui/gfx/platform_font_mac.h
index 05c124901ab7ecab356614f0a246eba08a0b3099..aa85f82cb97002f98e615f913e98938166863cac 100644
--- a/ui/gfx/platform_font_mac.h
+++ b/ui/gfx/platform_font_mac.h
@@ -19,21 +19,21 @@ class PlatformFontMac : 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;
+ Font DeriveFont(int size_delta, int style) const override;
+ int GetHeight() const override;
+ int GetBaseline() const override;
+ int GetCapHeight() const override;
+ int GetExpectedTextWidth(int length) const override;
+ int GetStyle() const override;
+ std::string GetFontName() const override;
+ std::string GetActualFontNameForTesting() const override;
+ int GetFontSize() const override;
+ const FontRenderParams& GetFontRenderParams() const override;
+ NativeFont GetNativeFont() const override;
private:
PlatformFontMac(const std::string& font_name, int font_size, int font_style);
- virtual ~PlatformFontMac();
+ ~PlatformFontMac() override;
// Calculates and caches the font metrics.
void CalculateMetrics();
« no previous file with comments | « ui/gfx/interpolated_transform.h ('k') | ui/gfx/render_text_harfbuzz.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698