| Index: ui/gfx/platform_font_ios.h
|
| diff --git a/ui/gfx/platform_font_ios.h b/ui/gfx/platform_font_ios.h
|
| index 8d2e7a12bf697b542fa34f52f297ef83e1417023..ca3f131d2990f115a3f7a31ab5120904f80429f7 100644
|
| --- a/ui/gfx/platform_font_ios.h
|
| +++ b/ui/gfx/platform_font_ios.h
|
| @@ -17,21 +17,21 @@ 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() 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() override;
|
| + NativeFont GetNativeFont() const override;
|
|
|
| private:
|
| PlatformFontIOS(const std::string& font_name, int font_size, int style);
|
| - virtual ~PlatformFontIOS() {}
|
| + ~PlatformFontIOS() override {}
|
|
|
| // Initialize the object with the specified parameters.
|
| void InitWithNameSizeAndStyle(const std::string& font_name,
|
|
|