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

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

Issue 16051006: ui/gfx: Use base::string16 now that string16 was moved into base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 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.mm ('k') | ui/gfx/platform_font_mac.mm » ('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 "ui/gfx/platform_font.h" 9 #include "ui/gfx/platform_font.h"
10 10
11 namespace gfx { 11 namespace gfx {
12 12
13 class PlatformFontMac : public PlatformFont { 13 class PlatformFontMac : public PlatformFont {
14 public: 14 public:
15 PlatformFontMac(); 15 PlatformFontMac();
16 explicit PlatformFontMac(NativeFont native_font); 16 explicit PlatformFontMac(NativeFont native_font);
17 PlatformFontMac(const std::string& font_name, 17 PlatformFontMac(const std::string& font_name,
18 int font_size); 18 int font_size);
19 19
20 // Overridden from PlatformFont: 20 // Overridden from PlatformFont:
21 virtual Font DeriveFont(int size_delta, int style) const OVERRIDE; 21 virtual Font DeriveFont(int size_delta, int style) const OVERRIDE;
22 virtual int GetHeight() const OVERRIDE; 22 virtual int GetHeight() const OVERRIDE;
23 virtual int GetBaseline() const OVERRIDE; 23 virtual int GetBaseline() const OVERRIDE;
24 virtual int GetAverageCharacterWidth() const OVERRIDE; 24 virtual int GetAverageCharacterWidth() const OVERRIDE;
25 virtual int GetStringWidth(const string16& text) const OVERRIDE; 25 virtual int GetStringWidth(const base::string16& text) 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 int GetFontSize() const OVERRIDE; 29 virtual int GetFontSize() const OVERRIDE;
30 virtual NativeFont GetNativeFont() const OVERRIDE; 30 virtual NativeFont GetNativeFont() const OVERRIDE;
31 31
32 private: 32 private:
33 PlatformFontMac(const std::string& font_name, int font_size, int style); 33 PlatformFontMac(const std::string& font_name, int font_size, int style);
34 virtual ~PlatformFontMac() {} 34 virtual ~PlatformFontMac() {}
35 35
(...skipping 13 matching lines...) Expand all
49 int height_; 49 int height_;
50 int ascent_; 50 int ascent_;
51 int average_width_; 51 int average_width_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(PlatformFontMac); 53 DISALLOW_COPY_AND_ASSIGN(PlatformFontMac);
54 }; 54 };
55 55
56 } // namespace gfx 56 } // namespace gfx
57 57
58 #endif // UI_GFX_PLATFORM_FONT_MAC_H_ 58 #endif // UI_GFX_PLATFORM_FONT_MAC_H_
OLDNEW
« no previous file with comments | « ui/gfx/platform_font_ios.mm ('k') | ui/gfx/platform_font_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698