Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(738)

Unified Diff: content/common/font_list_win.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/font_list_mac.mm ('k') | content/common/handle_enumerator_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
« no previous file with comments | « content/common/font_list_mac.mm ('k') | content/common/handle_enumerator_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698