diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 16:24:45 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 16:24:45 +0000 |
| commit | 76fcc3e9dc467366b9d1938834d7faff595ab873 (patch) | |
| tree | dcfc78d6c356be77a902a3fe5e59a6590fe7521e /views/controls/button | |
| parent | 3a742fcae0c094dd1ea11354fb3dcfe9ccc07a73 (diff) | |
| download | chromium_src-76fcc3e9dc467366b9d1938834d7faff595ab873.zip chromium_src-76fcc3e9dc467366b9d1938834d7faff595ab873.tar.gz chromium_src-76fcc3e9dc467366b9d1938834d7faff595ab873.tar.bz2 | |
Revert 71169 - Revert 71167 - Remove wstring from gfx.
BUG=68882
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6121004
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6134010
TBR=joi@chromium.org
Review URL: http://codereview.chromium.org/6130008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button')
| -rw-r--r-- | views/controls/button/text_button.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index 63eeb0e..470d97c 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -360,7 +360,7 @@ void TextButton::Paint(gfx::Canvas* canvas, bool for_drag) { text_bounds.y(), text_bounds.width(), text_bounds.height(), draw_string_flags); #else - canvas->DrawStringInt(UTF16ToWideHack(text_), + canvas->DrawStringInt(text_, font_, text_color, text_bounds.x(), @@ -371,11 +371,11 @@ void TextButton::Paint(gfx::Canvas* canvas, bool for_drag) { #endif } else if (has_text_halo_) { canvas->AsCanvasSkia()->DrawStringWithHalo( - UTF16ToWideHack(text_), font_, text_color, text_halo_color_, + 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(UTF16ToWideHack(text_), + canvas->DrawStringInt(text_, font_, text_color, text_bounds.x(), |