Add a progress meter to the downloads page....

chrome/browser/dom_ui/downloads_ui.cc

 // Copyright (c) 2006-2008 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/dom_ui/downloads_ui.h"
 
 #include "base/gfx/png_encoder.h"
 #include "base/string_piece.h"
 #include "base/thread.h"
 #include "base/time_format.h"
@@ skipping 160 matching lines @@
 
   // Clear all download items and their observers.
   void ClearDownloadItems();
 
   // Return the download that corresponds to a given id.
   DownloadItem* GetDownloadById(int id);
 
   // Return the download that is referred to in a given value.
   DownloadItem* GetDownloadByValue(const Value* value);
 
+  // Get the localized status text for an in-progress download.
+  std::wstring GetProgressStatusText(DownloadItem* download);
+
   // Current search text.
   std::wstring search_text_;
 
   // Our model
   DownloadManager* download_manager_;
 
   // The current set of visible DownloadItems for this view received from the
   // DownloadManager. DownloadManager owns the DownloadItems. The vector is
   // kept in order, sorted by ascending start time.
   typedef std::vector<DownloadItem*> OrderedDownloads;
@@ skipping 191 matching lines @@
   file_value->SetString(L"url", download->url().spec());
 
   if (download->state() == DownloadItem::IN_PROGRESS) {
     if (download->safety_state() == DownloadItem::DANGEROUS) {
       file_value->SetString(L"state", L"DANGEROUS");
     } else if (download->is_paused()) {
       file_value->SetString(L"state", L"PAUSED");
     } else {
       file_value->SetString(L"state", L"IN_PROGRESS");
     }
-    file_value->SetInteger(L"speed",
-        static_cast<int>(download->CurrentSpeed()));
+
+    file_value->SetString(L"progress_status_text",
+       GetProgressStatusText(download));
+
     file_value->SetInteger(L"percent",
         static_cast<int>(download->PercentComplete()));
     file_value->SetInteger(L"received",
         static_cast<int>(download->received_bytes()));
   } else if (download->state() == DownloadItem::CANCELLED) {
     file_value->SetString(L"state", L"CANCELLED");
   } else if (download->state() == DownloadItem::COMPLETE) {
     if (download->safety_state() == DownloadItem::DANGEROUS) {
       file_value->SetString(L"state", L"DANGEROUS");
     } else {
@@ skipping 28 matching lines @@
 }
 
 DownloadItem* DownloadsDOMHandler::GetDownloadByValue(const Value* value) {
   int id;
   if (ExtractIntegerValue(value, &id)) {
     return GetDownloadById(id);
   }
   return NULL;
 }
 
+std::wstring DownloadsDOMHandler::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 amount = received_size;
+
+  // Adjust both strings for the locale direction since we don't yet know which
+  // string we'll end up using for constructing the final progress string.
+  std::wstring amount_localized;
+  if (l10n_util::AdjustStringForLocaleDirection(amount, &amount_localized)) {
+    amount.assign(amount_localized);
+    received_size.assign(amount_localized);
+  }
+
+  amount_units = GetByteDisplayUnits(total);
+  std::wstring total_text = FormatBytes(total, amount_units, true);
+  std::wstring total_text_localized;
+  if (l10n_util::AdjustStringForLocaleDirection(total_text,
+      &total_text_localized))

[Ben Goodger (Google), 2009/03/24 05:14:29]

can you indent this to the next (?

+    total_text.assign(total_text_localized);
+
+  amount = l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_SIZE,
+                                 received_size,
+                                 total_text);
+
+  amount_units = GetByteDisplayUnits(download->CurrentSpeed());
+  std::wstring speed_text = FormatSpeed(download->CurrentSpeed(),
+    amount_units, true);

[Ben Goodger (Google), 2009/03/24 05:14:29]

4 space indent

+  std::wstring speed_text_localized;
+  if (l10n_util::AdjustStringForLocaleDirection(speed_text,
+      &speed_text_localized))

[Ben Goodger (Google), 2009/03/24 05:14:29]

indent to next (

+    speed_text.assign(speed_text_localized);
+
+  return l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_SPEED,
+                               speed_text,
+                               amount);
+}
+
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // DownloadsUI
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 DownloadsUI::DownloadsUI(WebContents* contents) : DOMUI(contents) {
   DownloadManager* dlm = GetProfile()->GetDownloadManager();
 
   DownloadsDOMHandler* handler = new DownloadsDOMHandler(this, dlm);
   AddMessageHandler(handler);
   handler->Init();
 
   DownloadsUIHTMLSource* html_source = new DownloadsUIHTMLSource();
 
   // Set up the chrome-ui://downloads/ source.
   g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(&chrome_url_data_manager,
           &ChromeURLDataManager::AddDataSource,
           html_source));
 }