Download resumption - Preliminary

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 39 matching lines @@
         status_text = l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED);
       } else {
         status_text.clear();
       }
       break;
     case DownloadItem::CANCELLED:
       status_text = l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_CANCELLED);
       break;
     case DownloadItem::INTERRUPTED: {
       content::DownloadInterruptReason reason = download_->GetLastReason();
+      // TODO(ahendrickson) -- Add information about whether or not it can be
+      // resumed.
       if (reason != content::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED) {
         string16 interrupt_reason = InterruptReasonStatusMessage(reason);
         string16 size_ratio = GetProgressSizesString();
         status_text = l10n_util::GetStringFUTF16(
             IDS_DOWNLOAD_STATUS_INTERRUPTED, size_ratio, interrupt_reason);
       } else {
         // Same as DownloadItem::CANCELLED.
         status_text = l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_CANCELLED);
       }
       break;
@@ skipping 165 matching lines @@
   string16 size_ratio = GetProgressSizesString();
 
   // The download is a CRX (app, extension, theme, ...) and it is being unpacked
   // and validated.
   if (download_->AllDataSaved() &&
       download_crx_util::IsExtensionDownload(*download_)) {
     return l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_CRX_INSTALL_RUNNING);
   }
 
   // A paused download: "100/120 MB, Paused"
-  if (download_->IsPaused()) {
+  if (download_->IsPaused() ||
+      (download_->CanResumeInterrupted() !=
+          DownloadItem::RESUME_MODE_INVALID)) {

[benjhayden, 2012/10/15 17:59:37]

Can this go on the previous line?

     return l10n_util::GetStringFUTF16(
         IDS_DOWNLOAD_STATUS_IN_PROGRESS, size_ratio,
         l10n_util::GetStringUTF16(IDS_DOWNLOAD_PROGRESS_PAUSED));
   }
 
   // A download scheduled to be opened when complete: "Opening in 10 secs"
   if (download_->GetOpenWhenComplete()) {
     if (!time_remaining_known)
       return l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_OPEN_WHEN_COMPLETE);
 
@@ skipping 136 matching lines @@
       break;
     default:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS;
       break;
   }
 
   status_text = l10n_util::GetStringUTF16(string_id);
 
   return status_text;
 }