ui/gfx/pango_util.cc - Issue 100303003: Move more uses of string16 to specify base::

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: ui/gfx/pango_util.cc

Issue 100303003: Move more uses of string16 to specify base:: (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:

Index: ui/gfx/pango_util.cc

diff --git a/ui/gfx/pango_util.cc b/ui/gfx/pango_util.cc

index c6f0b62f929b6a82d5d24314c35e045f1f6ebdce..1f8ac261b598a557d4ce6e39faa08e22ad7bda31 100644

--- a/ui/gfx/pango_util.cc

+++ b/ui/gfx/pango_util.cc

@@ -226,7 +226,8 @@ static void SetupPangoLayoutWithoutFont(

if (flags & Canvas::HIDE_PREFIX) {

DCHECK_EQ(1, g_unichar_to_utf8(kAcceleratorChar, NULL));

base::string16 accelerator_removed =

- RemoveAcceleratorChar(text, static_cast<char16>(kAcceleratorChar),

+ RemoveAcceleratorChar(text,

+ static_cast<base::char16>(kAcceleratorChar),

NULL, NULL);

utf8 = UTF16ToUTF8(accelerator_removed);

} else {

« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_x.cc ('k') | ui/gfx/render_text.cc » ('j') | no next file with comments »