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

Side by Side Diff: ui/gfx/platform_font_ios.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 unified diff | Download patch
« no previous file with comments | « ui/gfx/mac/coordinate_conversion_unittest.mm ('k') | ui/gfx/platform_font_mac.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_PLATFORM_FONT_IOS_H_ 5 #ifndef UI_GFX_PLATFORM_FONT_IOS_H_
6 #define UI_GFX_PLATFORM_FONT_IOS_H_ 6 #define UI_GFX_PLATFORM_FONT_IOS_H_
7 7
8 #include "ui/gfx/platform_font.h" 8 #include "ui/gfx/platform_font.h"
9 9
10 namespace gfx { 10 namespace gfx {
11 11
12 class PlatformFontIOS : public PlatformFont { 12 class PlatformFontIOS : public PlatformFont {
13 public: 13 public:
14 PlatformFontIOS(); 14 PlatformFontIOS();
15 explicit PlatformFontIOS(NativeFont native_font); 15 explicit PlatformFontIOS(NativeFont native_font);
16 PlatformFontIOS(const std::string& font_name, 16 PlatformFontIOS(const std::string& font_name,
17 int font_size); 17 int font_size);
18 18
19 // Overridden from PlatformFont: 19 // Overridden from PlatformFont:
20 virtual Font DeriveFont(int size_delta, int style) const OVERRIDE; 20 virtual Font DeriveFont(int size_delta, int style) const override;
21 virtual int GetHeight() const OVERRIDE; 21 virtual int GetHeight() const override;
22 virtual int GetBaseline() const OVERRIDE; 22 virtual int GetBaseline() const override;
23 virtual int GetCapHeight() const OVERRIDE; 23 virtual int GetCapHeight() const override;
24 virtual int GetExpectedTextWidth(int length) const OVERRIDE; 24 virtual int GetExpectedTextWidth(int length) const override;
25 virtual int GetStyle() const OVERRIDE; 25 virtual int GetStyle() const override;
26 virtual std::string GetFontName() const OVERRIDE; 26 virtual std::string GetFontName() const override;
27 virtual std::string GetActualFontNameForTesting() const OVERRIDE; 27 virtual std::string GetActualFontNameForTesting() const override;
28 virtual int GetFontSize() const OVERRIDE; 28 virtual int GetFontSize() const override;
29 virtual const FontRenderParams& GetFontRenderParams() const OVERRIDE; 29 virtual const FontRenderParams& GetFontRenderParams() const override;
30 virtual NativeFont GetNativeFont() const OVERRIDE; 30 virtual NativeFont GetNativeFont() const override;
31 31
32 private: 32 private:
33 PlatformFontIOS(const std::string& font_name, int font_size, int style); 33 PlatformFontIOS(const std::string& font_name, int font_size, int style);
34 virtual ~PlatformFontIOS() {} 34 virtual ~PlatformFontIOS() {}
35 35
36 // Initialize the object with the specified parameters. 36 // Initialize the object with the specified parameters.
37 void InitWithNameSizeAndStyle(const std::string& font_name, 37 void InitWithNameSizeAndStyle(const std::string& font_name,
38 int font_size, 38 int font_size,
39 int style); 39 int style);
40 40
41 // Calculate and cache the font metrics. 41 // Calculate and cache the font metrics.
42 void CalculateMetrics(); 42 void CalculateMetrics();
43 43
44 std::string font_name_; 44 std::string font_name_;
45 int font_size_; 45 int font_size_;
46 int style_; 46 int style_;
47 47
48 // Cached metrics, generated at construction. 48 // Cached metrics, generated at construction.
49 int height_; 49 int height_;
50 int ascent_; 50 int ascent_;
51 int cap_height_; 51 int cap_height_;
52 int average_width_; 52 int average_width_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(PlatformFontIOS); 54 DISALLOW_COPY_AND_ASSIGN(PlatformFontIOS);
55 }; 55 };
56 56
57 } // namespace gfx 57 } // namespace gfx
58 58
59 #endif // UI_GFX_PLATFORM_FONT_IOS_H_ 59 #endif // UI_GFX_PLATFORM_FONT_IOS_H_
OLDNEW
« no previous file with comments | « ui/gfx/mac/coordinate_conversion_unittest.mm ('k') | ui/gfx/platform_font_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698