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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/badge_util.cc

Issue 8392017: Change string16 to std::string in the gfx::Font() interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix mac unit tests Created 9 years, 2 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/cocoa/status_bubble_mac.mm ('k') | printing/print_settings_initializer.cc » ('j') | ui/gfx/font.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/badge_util.cc
diff --git a/chrome/common/badge_util.cc b/chrome/common/badge_util.cc
index 3175de82ba94423be9d3d5243f18b1407ab1beae..4531ff50e9a0a32a67b993e6ea0ca855856db17d 100644
--- a/chrome/common/badge_util.cc
+++ b/chrome/common/badge_util.cc
@@ -41,7 +41,7 @@ SkPaint* GetBadgeTextPaintSingleton() {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
typeface = SkTypeface::CreateFromName(
- UTF16ToUTF8(base_font.GetFontName()).c_str(), SkTypeface::kNormal);
+ base_font.GetFontName().c_str(), SkTypeface::kNormal);
DCHECK(typeface);
}
« no previous file with comments | « chrome/browser/ui/cocoa/status_bubble_mac.mm ('k') | printing/print_settings_initializer.cc » ('j') | ui/gfx/font.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698