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

Unified Diff: views/controls/textfield/native_textfield_views.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/textfield/gtk_views_textview.cc ('k') | views/drag_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/textfield/native_textfield_views.cc
===================================================================
--- views/controls/textfield/native_textfield_views.cc (revision 71168)
+++ views/controls/textfield/native_textfield_views.cc (working copy)
@@ -404,11 +404,13 @@
if ((*iter).selected) {
canvas->FillRectInt(selection_color, x_offset, y, width, text_height);
- canvas->DrawStringInt(text, GetFont(), kSelectedTextColor,
- x_offset, y, width, text_height);
+ canvas->DrawStringInt(
+ UTF16ToWide(text), GetFont(), kSelectedTextColor,
+ x_offset, y, width, text_height);
} else {
- canvas->DrawStringInt(text, GetFont(), text_color,
- x_offset, y, width, text_height);
+ canvas->DrawStringInt(
+ UTF16ToWide(text), GetFont(), text_color,
+ x_offset, y, width, text_height);
}
x_offset += width;
}
« no previous file with comments | « views/controls/textfield/gtk_views_textview.cc ('k') | views/drag_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698