diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 21:30:36 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 21:30:36 +0000 |
commit | 016d78de3eb0ee784728c99836cb42753e8dea60 (patch) | |
tree | 398679128dd10491063194548ae93fb3115fad19 /chrome/browser/download/download_item_model.cc | |
parent | 7b0ac2b15ccf3652097cb87d60f34f6bfda6388a (diff) | |
download | chromium_src-016d78de3eb0ee784728c99836cb42753e8dea60.zip chromium_src-016d78de3eb0ee784728c99836cb42753e8dea60.tar.gz chromium_src-016d78de3eb0ee784728c99836cb42753e8dea60.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@56603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/download_item_model.cc')
-rw-r--r-- | chrome/browser/download/download_item_model.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc index c360273..48c75ad 100644 --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc @@ -32,17 +32,15 @@ std::wstring DownloadItemModel::GetStatusText() { int64 total = download_->total_bytes(); DataUnits amount_units = GetByteDisplayUnits(total); - const string16 simple_size = WideToUTF16Hack(FormatBytes(size, amount_units, - false)); + const string16 simple_size = FormatBytes(size, amount_units, false); // In RTL locales, we render the text "size/total" in an RTL context. This // is problematic since a string such as "123/456 MB" is displayed // as "MB 123/456" because it ends with an LTR run. In order to solve this, // we mark the total string as an LTR string if the UI layout is // right-to-left so that the string "456 MB" is treated as an LTR run. - string16 simple_total = WideToUTF16Hack(FormatBytes(total, amount_units, - true)); - simple_total = base::i18n::GetDisplayStringInLTRDirectionality(simple_total); + string16 simple_total = base::i18n::GetDisplayStringInLTRDirectionality( + FormatBytes(total, amount_units, true)); TimeDelta remaining; string16 simple_time; @@ -71,8 +69,7 @@ std::wstring DownloadItemModel::GetStatusText() { // Instead of displaying "0 B" we keep the "Starting..." string. status_text = (size == 0) ? l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING) : - WideToUTF16Hack(FormatBytes(size, GetByteDisplayUnits(size), - true)); + FormatBytes(size, GetByteDisplayUnits(size), true); } else { status_text = l10n_util::GetStringFUTF16( IDS_DOWNLOAD_STATUS_IN_PROGRESS, simple_size, simple_total, |