Index: ui/gfx/platform_font_win.cc |
diff --git a/ui/gfx/platform_font_win.cc b/ui/gfx/platform_font_win.cc |
index 24a4b32904c68d971784f04d7c97dd7b8defb4a2..25e0b24ef4dca260c7750eab74558a71b3581d98 100644 |
--- a/ui/gfx/platform_font_win.cc |
+++ b/ui/gfx/platform_font_win.cc |
@@ -145,7 +145,7 @@ int PlatformFontWin::GetAverageCharacterWidth() const { |
return font_ref_->ave_char_width(); |
} |
-int PlatformFontWin::GetStringWidth(const string16& text) const { |
+int PlatformFontWin::GetStringWidth(const base::string16& text) const { |
return Canvas::GetStringWidth(text, |
Font(const_cast<PlatformFontWin*>(this))); |
} |
@@ -273,7 +273,7 @@ PlatformFontWin::HFontRef::HFontRef(HFONT hfont, |
LOGFONT font_info; |
GetObject(hfont_, sizeof(LOGFONT), &font_info); |
- font_name_ = UTF16ToUTF8(string16(font_info.lfFaceName)); |
+ font_name_ = UTF16ToUTF8(base::string16(font_info.lfFaceName)); |
if (font_info.lfHeight < 0) |
requested_font_size_ = -font_info.lfHeight; |
} |