diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 23:11:28 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 23:11:28 +0000 |
commit | 7b83a107f3feaa0bd220b0ac6f983d7a3b82c44e (patch) | |
tree | 3f64360ee3d06327326187ace7065957c264efe2 /chrome/browser/download/download_util.cc | |
parent | c48d1ef5985b7084bdbca953db85fae43ca564c5 (diff) | |
download | chromium_src-7b83a107f3feaa0bd220b0ac6f983d7a3b82c44e.zip chromium_src-7b83a107f3feaa0bd220b0ac6f983d7a3b82c44e.tar.gz chromium_src-7b83a107f3feaa0bd220b0ac6f983d7a3b82c44e.tar.bz2 |
Convert FormatBytes to string16.
I considered ASCII, but it's producing what is intended to be a
human-readable string. For example, in theory the "bytes/s" annotation
could be localized into a language where the "b" is non-ASCII.
Review URL: http://codereview.chromium.org/3107021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/download_util.cc')
-rw-r--r-- | chrome/browser/download/download_util.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index e76bf6e..e7f75c9 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -591,7 +591,8 @@ std::wstring GetProgressStatusText(DownloadItem* download) { int64 total = download->total_bytes(); int64 size = download->received_bytes(); DataUnits amount_units = GetByteDisplayUnits(size); - std::wstring received_size = FormatBytes(size, amount_units, true); + std::wstring received_size = UTF16ToWideHack(FormatBytes(size, amount_units, + true)); std::wstring amount = received_size; // Adjust both strings for the locale direction since we don't yet know which @@ -604,7 +605,8 @@ std::wstring GetProgressStatusText(DownloadItem* download) { if (total) { amount_units = GetByteDisplayUnits(total); - std::wstring total_text = FormatBytes(total, amount_units, true); + std::wstring total_text = + UTF16ToWideHack(FormatBytes(total, amount_units, true)); std::wstring total_text_localized; if (base::i18n::AdjustStringForLocaleDirection(total_text, &total_text_localized)) @@ -617,8 +619,9 @@ std::wstring GetProgressStatusText(DownloadItem* download) { amount.assign(received_size); } amount_units = GetByteDisplayUnits(download->CurrentSpeed()); - std::wstring speed_text = FormatSpeed(download->CurrentSpeed(), - amount_units, true); + std::wstring speed_text = + UTF16ToWideHack(FormatSpeed(download->CurrentSpeed(), amount_units, + true)); std::wstring speed_text_localized; if (base::i18n::AdjustStringForLocaleDirection(speed_text, &speed_text_localized)) |