| Index: gfx/font.cc
|
| ===================================================================
|
| --- gfx/font.cc (revision 71043)
|
| +++ gfx/font.cc (working copy)
|
| @@ -30,7 +30,7 @@
|
| Font::Font(PlatformFont* platform_font) : platform_font_(platform_font) {
|
| }
|
|
|
| -Font::Font(const std::wstring& font_name, int font_size)
|
| +Font::Font(const string16& font_name, int font_size)
|
| : platform_font_(PlatformFont::CreateFromNameAndSize(font_name,
|
| font_size)) {
|
| }
|
| @@ -70,7 +70,7 @@
|
| return platform_font_->GetStyle();
|
| }
|
|
|
| -const std::wstring& Font::GetFontName() const {
|
| +const string16& Font::GetFontName() const {
|
| return platform_font_->GetFontName();
|
| }
|
|
|
|
|