summaryrefslogtreecommitdiffstats
path: root/ui/gfx/platform_font_mac.h
diff options
context:
space:
mode:
Diffstat (limited to 'ui/gfx/platform_font_mac.h')
-rw-r--r--ui/gfx/platform_font_mac.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/gfx/platform_font_mac.h b/ui/gfx/platform_font_mac.h
index 6196137..64ae669 100644
--- a/ui/gfx/platform_font_mac.h
+++ b/ui/gfx/platform_font_mac.h
@@ -15,7 +15,7 @@ class PlatformFontMac : public PlatformFont {
PlatformFontMac();
explicit PlatformFontMac(const Font& other);
explicit PlatformFontMac(NativeFont native_font);
- PlatformFontMac(const string16& font_name,
+ PlatformFontMac(const std::string& font_name,
int font_size);
// Overridden from PlatformFont:
@@ -26,23 +26,23 @@ class PlatformFontMac : public PlatformFont {
virtual int GetStringWidth(const string16& text) const;
virtual int GetExpectedTextWidth(int length) const;
virtual int GetStyle() const;
- virtual string16 GetFontName() const;
+ virtual std::string GetFontName() const;
virtual int GetFontSize() const;
virtual NativeFont GetNativeFont() const;
private:
- PlatformFontMac(const string16& font_name, int font_size, int style);
+ PlatformFontMac(const std::string& font_name, int font_size, int style);
virtual ~PlatformFontMac() {}
// Initialize the object with the specified parameters.
- void InitWithNameSizeAndStyle(const string16& font_name,
+ void InitWithNameSizeAndStyle(const std::string& font_name,
int font_size,
int style);
// Calculate and cache the font metrics.
void CalculateMetrics();
- string16 font_name_;
+ std::string font_name_;
int font_size_;
int style_;