Index: content/common/font_list_win.cc |
diff --git a/content/common/font_list_win.cc b/content/common/font_list_win.cc |
index 0eb84ed7237930deea2c653a06a52843cbd4772a..bc6c1dcd1ed296bc5f336dce9b4c7b9f8d17121b 100644 |
--- a/content/common/font_list_win.cc |
+++ b/content/common/font_list_win.cc |
@@ -17,12 +17,12 @@ static int CALLBACK EnumFontFamExProc(ENUMLOGFONTEXW* logical_font, |
NEWTEXTMETRICEXW* physical_font, |
DWORD font_type, |
LPARAM lparam) { |
- std::set<string16>* font_names = |
- reinterpret_cast<std::set<string16>*>(lparam); |
+ std::set<base::string16>* font_names = |
+ reinterpret_cast<std::set<base::string16>*>(lparam); |
if (font_names) { |
const LOGFONTW& lf = logical_font->elfLogFont; |
if (lf.lfFaceName[0] && lf.lfFaceName[0] != '@') { |
- string16 face_name(lf.lfFaceName); |
+ base::string16 face_name(lf.lfFaceName); |
font_names->insert(face_name); |
} |
} |
@@ -30,7 +30,7 @@ static int CALLBACK EnumFontFamExProc(ENUMLOGFONTEXW* logical_font, |
} |
scoped_ptr<base::ListValue> GetFontList_SlowBlocking() { |
- std::set<string16> font_names; |
+ std::set<base::string16> font_names; |
LOGFONTW logfont; |
memset(&logfont, 0, sizeof(logfont)); |
@@ -42,7 +42,7 @@ scoped_ptr<base::ListValue> GetFontList_SlowBlocking() { |
::ReleaseDC(NULL, hdc); |
scoped_ptr<base::ListValue> font_list(new base::ListValue); |
- std::set<string16>::iterator iter; |
+ std::set<base::string16>::iterator iter; |
for (iter = font_names.begin(); iter != font_names.end(); ++iter) { |
base::ListValue* font_item = new base::ListValue(); |
font_item->Append(new base::StringValue(*iter)); |