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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/badge_util.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/ui/views/theme_install_bubble_view.cc ('k') | gfx/canvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/badge_util.cc
===================================================================
--- chrome/common/badge_util.cc (revision 71168)
+++ chrome/common/badge_util.cc (working copy)
@@ -40,7 +40,7 @@
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
typeface = SkTypeface::CreateFromName(
- UTF16ToUTF8(base_font.GetFontName()).c_str(), SkTypeface::kNormal);
+ WideToUTF8(base_font.GetFontName()).c_str(), SkTypeface::kNormal);
}
text_paint->setTypeface(typeface);
Property changes on: chrome/common/badge_util.cc
___________________________________________________________________
Deleted: svn:eol-style
- LF
« no previous file with comments | « chrome/browser/ui/views/theme_install_bubble_view.cc ('k') | gfx/canvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698