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

Unified Diff: chrome/browser/gtk/options/fonts_page_gtk.cc

Issue 6134010: Revert 71167 - Remove wstring from gfx.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months 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 | « chrome/browser/gtk/bookmark_utils_gtk.cc ('k') | chrome/browser/gtk/tabs/tab_renderer_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/options/fonts_page_gtk.cc
===================================================================
--- chrome/browser/gtk/options/fonts_page_gtk.cc (revision 71168)
+++ chrome/browser/gtk/options/fonts_page_gtk.cc (working copy)
@@ -24,14 +24,14 @@
// The given font might not be available (the default fonts we use are not
// installed by default on some distros). So figure out which font we are
// actually falling back to and display that. (See crbug.com/31381.)
- string16 actual_family_name = gfx::Font(
- UTF8ToUTF16(family_name), pixel_size).GetFontName();
+ std::wstring actual_family_name = gfx::Font(
+ UTF8ToWide(family_name), pixel_size).GetFontName();
std::string fontname;
// TODO(mattm): We can pass in the size in pixels (px), and the font button
// actually honors it, but when you open the selector it interprets it as
// points. See crbug.com/17857
base::SStringPrintf(&fontname, "%s, %dpx",
- UTF16ToUTF8(actual_family_name).c_str(), pixel_size);
+ WideToUTF8(actual_family_name).c_str(), pixel_size);
return fontname;
}
« no previous file with comments | « chrome/browser/gtk/bookmark_utils_gtk.cc ('k') | chrome/browser/gtk/tabs/tab_renderer_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698