chrome/common/badge_util.cc - Issue 8392017: Change string16 to std::string in the gfx::Font() interface.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Add 'UTF-8' everywhere in the comments 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:

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') | no next file with comments »