views/controls/button/text_button.cc - Issue 6134010: Revert 71167 - Remove wstring from gfx....

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: views/controls/button/text_button.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:

Index: views/controls/button/text_button.cc

===================================================================

--- views/controls/button/text_button.cc (revision 71168)

+++ views/controls/button/text_button.cc (working copy)

@@ -360,7 +360,7 @@

text_bounds.y(), text_bounds.width(), text_bounds.height(),

draw_string_flags);

#else

- canvas->DrawStringInt(text_,

+ canvas->DrawStringInt(UTF16ToWideHack(text_),

font_,

text_color,

text_bounds.x(),

@@ -371,11 +371,11 @@

#endif

} else if (has_text_halo_) {

canvas->AsCanvasSkia()->DrawStringWithHalo(

- text_, font_, text_color, text_halo_color_,

+ UTF16ToWideHack(text_), font_, text_color, text_halo_color_,

text_bounds.x(), text_bounds.y(), text_bounds.width(),

text_bounds.height(), draw_string_flags);

} else {

- canvas->DrawStringInt(text_,

+ canvas->DrawStringInt(UTF16ToWideHack(text_),

font_,

text_color,

text_bounds.x(),

« no previous file with comments | « gfx/platform_font_win.cc ('k') | views/controls/label.cc » ('j') | no next file with comments »