Index: gfx/platform_font_win.cc |
=================================================================== |
--- gfx/platform_font_win.cc (revision 71043) |
+++ gfx/platform_font_win.cc (working copy) |
@@ -69,7 +69,7 @@ |
InitWithCopyOfHFONT(native_font); |
} |
-PlatformFontWin::PlatformFontWin(const std::wstring& font_name, |
+PlatformFontWin::PlatformFontWin(const string16& font_name, |
int font_size) { |
InitWithFontNameAndSize(font_name, font_size); |
} |
@@ -117,7 +117,7 @@ |
return font_ref_->style(); |
} |
-const std::wstring& PlatformFontWin::GetFontName() const { |
+string16 PlatformFontWin::GetFontName() const { |
return font_ref_->font_name(); |
} |
@@ -150,7 +150,7 @@ |
font_ref_ = CreateHFontRef(CreateFontIndirect(&font_info)); |
} |
-void PlatformFontWin::InitWithFontNameAndSize(const std::wstring& font_name, |
+void PlatformFontWin::InitWithFontNameAndSize(const string16& font_name, |
int font_size) { |
HDC hdc = GetDC(NULL); |
long lf_height = -MulDiv(font_size, GetDeviceCaps(hdc, LOGPIXELSY), 72); |
@@ -235,7 +235,7 @@ |
LOGFONT font_info; |
GetObject(hfont_, sizeof(LOGFONT), &font_info); |
- font_name_ = std::wstring(font_info.lfFaceName); |
+ font_name_ = string16(font_info.lfFaceName); |
} |
PlatformFontWin::HFontRef::~HFontRef() { |
@@ -261,7 +261,7 @@ |
} |
// static |
-PlatformFont* PlatformFont::CreateFromNameAndSize(const std::wstring& font_name, |
+PlatformFont* PlatformFont::CreateFromNameAndSize(const string16& font_name, |
int font_size) { |
return new PlatformFontWin(font_name, font_size); |
} |