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

Side by Side Diff: ui/gfx/platform_font_mac.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/platform_font_ios.h ('k') | ui/gfx/platform_font_pango.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_MAC_H_ 5 #ifndef UI_GFX_PLATFORM_FONT_MAC_H_
6 #define UI_GFX_PLATFORM_FONT_MAC_H_ 6 #define UI_GFX_PLATFORM_FONT_MAC_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/mac/scoped_nsobject.h" 9 #include "base/mac/scoped_nsobject.h"
10 #include "ui/gfx/platform_font.h" 10 #include "ui/gfx/platform_font.h"
11 11
12 namespace gfx { 12 namespace gfx {
13 13
14 class PlatformFontMac : public PlatformFont { 14 class PlatformFontMac : public PlatformFont {
15 public: 15 public:
16 PlatformFontMac(); 16 PlatformFontMac();
17 explicit PlatformFontMac(NativeFont native_font); 17 explicit PlatformFontMac(NativeFont native_font);
18 PlatformFontMac(const std::string& font_name, 18 PlatformFontMac(const std::string& font_name,
19 int font_size); 19 int font_size);
20 20
21 // Overridden from PlatformFont: 21 // Overridden from PlatformFont:
22 virtual Font DeriveFont(int size_delta, int style) const OVERRIDE; 22 virtual Font DeriveFont(int size_delta, int style) const override;
23 virtual int GetHeight() const OVERRIDE; 23 virtual int GetHeight() const override;
24 virtual int GetBaseline() const OVERRIDE; 24 virtual int GetBaseline() const override;
25 virtual int GetCapHeight() const OVERRIDE; 25 virtual int GetCapHeight() const override;
26 virtual int GetExpectedTextWidth(int length) const OVERRIDE; 26 virtual int GetExpectedTextWidth(int length) const override;
27 virtual int GetStyle() const OVERRIDE; 27 virtual int GetStyle() const override;
28 virtual std::string GetFontName() const OVERRIDE; 28 virtual std::string GetFontName() const override;
29 virtual std::string GetActualFontNameForTesting() const OVERRIDE; 29 virtual std::string GetActualFontNameForTesting() const override;
30 virtual int GetFontSize() const OVERRIDE; 30 virtual int GetFontSize() const override;
31 virtual const FontRenderParams& GetFontRenderParams() const OVERRIDE; 31 virtual const FontRenderParams& GetFontRenderParams() const override;
32 virtual NativeFont GetNativeFont() const OVERRIDE; 32 virtual NativeFont GetNativeFont() const override;
33 33
34 private: 34 private:
35 PlatformFontMac(const std::string& font_name, int font_size, int font_style); 35 PlatformFontMac(const std::string& font_name, int font_size, int font_style);
36 virtual ~PlatformFontMac(); 36 virtual ~PlatformFontMac();
37 37
38 // Calculates and caches the font metrics. 38 // Calculates and caches the font metrics.
39 void CalculateMetrics(); 39 void CalculateMetrics();
40 40
41 // The NSFont instance for this object. If this object was constructed from an 41 // The NSFont instance for this object. If this object was constructed from an
42 // NSFont instance, this holds that NSFont instance. Otherwise this NSFont 42 // NSFont instance, this holds that NSFont instance. Otherwise this NSFont
(...skipping 12 matching lines...) Expand all
55 int ascent_; 55 int ascent_;
56 int cap_height_; 56 int cap_height_;
57 int average_width_; 57 int average_width_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(PlatformFontMac); 59 DISALLOW_COPY_AND_ASSIGN(PlatformFontMac);
60 }; 60 };
61 61
62 } // namespace gfx 62 } // namespace gfx
63 63
64 #endif // UI_GFX_PLATFORM_FONT_MAC_H_ 64 #endif // UI_GFX_PLATFORM_FONT_MAC_H_
OLDNEW
« no previous file with comments | « ui/gfx/platform_font_ios.h ('k') | ui/gfx/platform_font_pango.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698