Localize strings, speeds.

chrome/browser/download/download_item_model.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/download/download_item_model.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/common/time_format.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/text/bytes_formatting.h"
 
 using base::TimeDelta;
 
 // -----------------------------------------------------------------------------
 // DownloadItemModel
 
 DownloadItemModel::DownloadItemModel(DownloadItem* download)
     : BaseDownloadItemModel(download) {
 }
 
 void DownloadItemModel::CancelTask() {
   download_->Cancel(true /* update history service */);
 }
 
 string16 DownloadItemModel::GetStatusText() {
   int64 size = download_->received_bytes();
   int64 total = download_->total_bytes();
 
-  DataUnits amount_units = GetByteDisplayUnits(total);
-  const string16 simple_size = FormatBytes(size, amount_units, false);
+  ui::DataUnits amount_units = ui::GetByteDisplayUnits(total);
+  string16 simple_size = ui::FormatBytesWithUnits(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 = base::i18n::GetDisplayStringInLTRDirectionality(
-      FormatBytes(total, amount_units, true));
+      ui::FormatBytesWithUnits(total, amount_units, true));
 
   TimeDelta remaining;
   string16 simple_time;
   if (download_->IsInProgress() && download_->is_paused()) {
     simple_time = l10n_util::GetStringUTF16(IDS_DOWNLOAD_PROGRESS_PAUSED);
   } else if (download_->TimeRemaining(&remaining)) {
     simple_time = download_->open_when_complete() ?
                       TimeFormat::TimeRemainingShort(remaining) :
                       TimeFormat::TimeRemaining(remaining);
   }
@@ skipping 10 matching lines @@
         if (simple_time.empty()) {
           status_text =
               l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_OPEN_WHEN_COMPLETE);
         } else {
           status_text = l10n_util::GetStringFUTF16(IDS_DOWNLOAD_STATUS_OPEN_IN,
                                                    simple_time);
         }
       } else {
         if (simple_time.empty()) {
           // Instead of displaying "0 B" we keep the "Starting..." string.
-          status_text = (size == 0) ?
-              l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING) :
-              FormatBytes(size, GetByteDisplayUnits(size), true);
+          status_text = (size == 0)
+              ? l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING)
+              : ui::FormatBytes(size);
         } else {
           status_text = l10n_util::GetStringFUTF16(
               IDS_DOWNLOAD_STATUS_IN_PROGRESS, simple_size, simple_total,
               simple_time);
         }
       }
       break;
     case DownloadItem::COMPLETE:
       if (download_->file_externally_removed()) {
         status_text = l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED);
@@ skipping 55 matching lines @@
           IDS_SAVE_PAGE_STATUS_INTERRUPTED,
           base::FormatNumber(size),
           base::FormatNumber(total_size));
       break;
     default:
       NOTREACHED();
   }
 
   return status_text;
 }