Index: gfx/platform_font_mac.h |
=================================================================== |
--- gfx/platform_font_mac.h (revision 71168) |
+++ gfx/platform_font_mac.h (working copy) |
@@ -15,7 +15,7 @@ |
PlatformFontMac(); |
explicit PlatformFontMac(const Font& other); |
explicit PlatformFontMac(NativeFont native_font); |
- PlatformFontMac(const string16& font_name, |
+ PlatformFontMac(const std::wstring& font_name, |
int font_size); |
// Overridden from PlatformFont: |
@@ -26,23 +26,23 @@ |
virtual int GetStringWidth(const string16& text) const; |
virtual int GetExpectedTextWidth(int length) const; |
virtual int GetStyle() const; |
- virtual string16 GetFontName() const; |
+ virtual const std::wstring& GetFontName() const; |
virtual int GetFontSize() const; |
virtual NativeFont GetNativeFont() const; |
private: |
- PlatformFontMac(const string16& font_name, int font_size, int style); |
+ PlatformFontMac(const std::wstring& 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::wstring& font_name, |
int font_size, |
int style); |
// Calculate and cache the font metrics. |
void CalculateMetrics(); |
- string16 font_name_; |
+ std::wstring font_name_; |
int font_size_; |
int style_; |