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

Unified Diff: ui/gfx/platform_font_mac.h

Issue 8468021: Add OVERRIDE to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes n stuff Created 9 years, 1 month 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/native_theme_base.h ('k') | ui/gfx/platform_font_pango.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 64ae669ec7ebfa2ebe431e85753c8c95b59ae830..60076152b059013024b5fa206e15b8fa5c08b00b 100644
--- a/ui/gfx/platform_font_mac.h
+++ b/ui/gfx/platform_font_mac.h
@@ -6,6 +6,7 @@
#define UI_GFX_PLATFORM_FONT_MAC_H_
#pragma once
+#include "base/compiler_specific.h"
#include "ui/gfx/platform_font.h"
namespace gfx {
@@ -19,16 +20,16 @@ class PlatformFontMac : public PlatformFont {
int font_size);
// Overridden from PlatformFont:
- virtual Font DeriveFont(int size_delta, int style) const;
- virtual int GetHeight() const;
- virtual int GetBaseline() const;
- virtual int GetAverageCharacterWidth() const;
- virtual int GetStringWidth(const string16& text) const;
- virtual int GetExpectedTextWidth(int length) const;
- virtual int GetStyle() const;
- virtual std::string GetFontName() const;
- virtual int GetFontSize() const;
- virtual NativeFont GetNativeFont() const;
+ virtual Font DeriveFont(int size_delta, int style) const OVERRIDE;
+ virtual int GetHeight() const OVERRIDE;
+ virtual int GetBaseline() const OVERRIDE;
+ virtual int GetAverageCharacterWidth() const OVERRIDE;
+ virtual int GetStringWidth(const string16& text) const OVERRIDE;
+ virtual int GetExpectedTextWidth(int length) const OVERRIDE;
+ virtual int GetStyle() const OVERRIDE;
+ virtual std::string GetFontName() const OVERRIDE;
+ virtual int GetFontSize() const OVERRIDE;
+ virtual NativeFont GetNativeFont() const OVERRIDE;
private:
PlatformFontMac(const std::string& font_name, int font_size, int style);
« no previous file with comments | « ui/gfx/native_theme_base.h ('k') | ui/gfx/platform_font_pango.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698