Localize strings, speeds.

chrome/browser/ui/webui/chromeos/imageburner_ui.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/ui/webui/chromeos/imageburner_ui.h"
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/download/download_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/text/bytes_formatting.h"
 
 static const char kPropertyDevicePath[] = "devicePath";
 static const char kPropertyFilePath[] = "filePath";
 static const char kPropertyLabel[] = "label";
 static const char kPropertyPath[] = "path";
 
 static const char kConfigFileUrl[] =
     "https://dl.google.com/dl/edgedl/chromeos/recovery/recovery.conf";
 static const char kImageZipFileName[] = "chromeos_image.bin.zip";
 static const char kTempImageFolderName[] = "chromeos_image";
@@ skipping 569 matching lines @@
   if (time_left) {
     string16 time_remaining_str = TimeFormat::TimeRemaining(*time_left);
     *time_left_text =
         l10n_util::GetStringFUTF16(message_id, time_remaining_str);
   } else {
     *time_left_text = l10n_util::GetStringUTF16(message_id);
   }
 }
 
 void ImageBurnHandler::GetDataSizeText(int64 size, string16* size_text) {
-  DataUnits size_units = GetByteDisplayUnits(size);
-  *size_text = FormatBytes(size, size_units, true);
+  *size_text = ui::FormatBytes(size, ui::DATA_UNITS_NATURAL, true);
   base::i18n::AdjustStringForLocaleDirection(size_text);
 }
 
 void ImageBurnHandler::GetProgressText(int message_id,
     int64 amount_finished, int64 amount_total, string16* progress_text) {
   string16 finished;
   GetDataSizeText(amount_finished, &finished);
   string16 total;
   GetDataSizeText(amount_total, &total);
   *progress_text = l10n_util::GetStringFUTF16(message_id, finished, total);
@@ skipping 418 matching lines @@
 //
 // ImageBurnUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 ImageBurnUI::ImageBurnUI(TabContents* contents) : ChromeWebUI(contents) {
   ImageBurnHandler* handler = new ImageBurnHandler(contents);
   AddMessageHandler((handler)->Attach(this));
   ImageBurnUIHTMLSource* html_source = new ImageBurnUIHTMLSource();
   contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
 }