Added download error descriptions to tooltips for Mac & Linux.

chrome/browser/download/download_item_model.cc

 // Copyright (c) 2012 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/sys_string_conversions.h"
@@ skipping 20 matching lines @@
 // DownloadItemModel
 
 DownloadItemModel::DownloadItemModel(DownloadItem* download)
     : BaseDownloadItemModel(download) {
 }
 
 void DownloadItemModel::CancelTask() {
   download_->Cancel(true /* update history service */);
 }
 
+string16 DownloadItemModel::GetProgressText() {
+  int64 size = 0;
+  int64 total= 0;

[sky, 2012/04/04 16:55:34]

nit: 'total ='

[ahendrickson, 2012/04/04 17:49:32]

Done.

+  string16 simple_size;
+  string16 simple_total;
+  GetStatusData(&size, &total, &simple_size, &simple_total);
+
+  if (total > 0) {
+    // We know the total.
+    return l10n_util::GetStringFUTF16(
+        IDS_DOWNLOAD_STATUS_IN_PROGRESS_SIZES_ONLY, simple_size, simple_total);
+  }
+
+  return ui::FormatBytes(size);
+}
+
 string16 DownloadItemModel::GetStatusText() {
-  int64 size = download_->GetReceivedBytes();
-  int64 total = download_->AllDataSaved() ? size : download_->GetTotalBytes();
-  bool is_gdata = false;
-#if defined(OS_CHROMEOS)
-  is_gdata = gdata::GDataDownloadObserver::IsGDataDownload(download_);
-  // For GData downloads, the size is the count of bytes uploaded.
-  if (is_gdata)
-    size = gdata::GDataDownloadObserver::GetUploadedBytes(download_);
-#endif
-
-  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(
-      ui::FormatBytesWithUnits(total, amount_units, true));
+  int64 size = 0;
+  int64 total= 0;
+  string16 simple_size;
+  string16 simple_total;
+  bool is_gdata = GetStatusData(&size, &total, &simple_size, &simple_total);
 
   // TODO(asanka): Calculate a TimeRemaining() for GData uploads.
   TimeDelta remaining;
   string16 simple_time;
   if (download_->IsInProgress() && download_->IsPaused()) {
     simple_time = l10n_util::GetStringUTF16(IDS_DOWNLOAD_PROGRESS_PAUSED);
   } else if (!is_gdata && download_->TimeRemaining(&remaining)) {
     simple_time = download_->GetOpenWhenComplete() ?
                       TimeFormat::TimeRemainingShort(remaining) :
                       TimeFormat::TimeRemaining(remaining);
@@ skipping 158 matching lines @@
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 bool DownloadItemModel::IsDangerous() {
   return download_->GetSafetyState() == DownloadItem::DANGEROUS;
 }
 
+bool DownloadItemModel::GetStatusData(int64* size_return,
+                                      int64* total_return,
+                                      string16* simple_size_return,
+                                      string16* simple_total_return) {
+  int64 size = download_->GetReceivedBytes();
+  int64 total = download_->AllDataSaved() ? size : download_->GetTotalBytes();
+  bool is_gdata = false;
+
+#if defined(OS_CHROMEOS)
+  is_gdata = gdata::GDataDownloadObserver::IsGDataDownload(download_);
+  // For GData downloads, the size is the count of bytes uploaded.
+  if (is_gdata)
+    size = gdata::GDataDownloadObserver::GetUploadedBytes(download_);
+#endif
+
+  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(
+      ui::FormatBytesWithUnits(total, amount_units, true));
+
+  if (size_return)
+    *size_return = size;
+  if (total_return)
+    *total_return = total;
+  if (simple_size_return)
+    *simple_size_return = simple_size;
+  if (simple_total_return)
+    *simple_total_return = simple_total;
+
+  return is_gdata;
+}
+
 // static
 string16 BaseDownloadItemModel::InterruptReasonStatusMessage(int reason) {
   int string_id = 0;
 
   switch (reason) {
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_ACCESS_DENIED;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_NO_SPACE:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_DISK_FULL;
@@ skipping 96 matching lines @@
       break;
     default:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS;
       break;
   }
 
   status_text = l10n_util::GetStringUTF16(string_id);
 
   return status_text;
 }