diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 16:48:58 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 16:48:58 +0000 |
| commit | 8050ca9e629f560af14653566de54a12dc2bcc78 (patch) | |
| tree | 7a260a343229527e5a958d52f2d81d89da4610d7 /views/controls/progress_bar.cc | |
| parent | 94cf539833e4c68c2a2ceaf59443a6cdc0cc684d (diff) | |
| download | chromium_src-8050ca9e629f560af14653566de54a12dc2bcc78.zip chromium_src-8050ca9e629f560af14653566de54a12dc2bcc78.tar.gz chromium_src-8050ca9e629f560af14653566de54a12dc2bcc78.tar.bz2 | |
Remove wstring from views. Part 1: Switch member variables to string16.
BUG=68267
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6123003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/progress_bar.cc')
| -rw-r--r-- | views/controls/progress_bar.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/views/controls/progress_bar.cc b/views/controls/progress_bar.cc index 7e4aecf..136ffb8 100644 --- a/views/controls/progress_bar.cc +++ b/views/controls/progress_bar.cc @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "gfx/color_utils.h" #include "gfx/font.h" @@ -291,14 +292,14 @@ void ProgressBar::AddProgress(int tick) { } void ProgressBar::SetTooltipText(const std::wstring& tooltip_text) { - tooltip_text_ = tooltip_text; + tooltip_text_ = WideToUTF16Hack(tooltip_text); } bool ProgressBar::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) { DCHECK(tooltip); if (tooltip == NULL) return false; - tooltip->assign(tooltip_text_); + tooltip->assign(UTF16ToWideHack(tooltip_text_)); return !tooltip_text_.empty(); } |