| Index: ui/gfx/platform_font_pango.h
|
| diff --git a/ui/gfx/platform_font_pango.h b/ui/gfx/platform_font_pango.h
|
| index 2e4ccdd3b50473a3543eccf940d7bfc8e68359df..7f8193946c349acb8e89a6146c262ce2e094dcf1 100644
|
| --- a/ui/gfx/platform_font_pango.h
|
| +++ b/ui/gfx/platform_font_pango.h
|
| @@ -6,6 +6,7 @@
|
| #define UI_GFX_PLATFORM_FONT_PANGO_H_
|
| #pragma once
|
|
|
| +#include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "third_party/skia/include/core/SkRefCnt.h"
|
| #include "ui/gfx/platform_font.h"
|
| @@ -39,16 +40,16 @@ class UI_EXPORT PlatformFontPango : public PlatformFont {
|
| double underline_thickness() const;
|
|
|
| // 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:
|
| // Create a new instance of this object with the specified properties. Called
|
|
|