content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc - Issue 102593002: Convert string16 to base::string16 in content.

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: content/browser/renderer_host/pepper/pepper_truetype_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/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc ('k') | content/browser/renderer_host/render_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc

diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc

index e5cdcc6b01fb92d832bc7eaba81ad034de25e313..3530e1e1b5e61c5019ab9bb16aacc43001b816d3 100644

--- a/content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc

+++ b/content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc

@@ -73,7 +73,7 @@ void GetFontsInFamily_SlowBlocking(const std::string& family,

LOGFONTW logfont;

memset(&logfont, 0, sizeof(logfont));

logfont.lfCharSet = DEFAULT_CHARSET;

- string16 family16 = UTF8ToUTF16(family);

+ base::string16 family16 = UTF8ToUTF16(family);

memcpy(&logfont.lfFaceName, &family16[0], sizeof(logfont.lfFaceName));

base::win::ScopedCreateDC hdc(::CreateCompatibleDC(NULL));

::EnumFontFamiliesExW(hdc, &logfont, (FONTENUMPROCW)&EnumFontsInFamilyProc,