[Download Notification] Refine retry logic when interrupted or cancelled

chrome/browser/download/download_commands.cc

 // Copyright 2015 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_commands.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/download_protection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
+#include "content/public/browser/download_manager.h"
+#include "content/public/browser/download_url_parameters.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/download/download_target_determiner.h"
 #include "chrome/browser/ui/pdf/adobe_reader_info_win.h"
 #endif
 
 DownloadCommands::DownloadCommands(content::DownloadItem* download_item)
@@ skipping 101 matching lines @@
 }
 
 bool DownloadCommands::IsCommandVisible(Command command) const {
   if (command == PLATFORM_OPEN)
     return (DownloadItemModel(download_item_).ShouldPreferOpeningInBrowser());
 
   return true;
 }
 
 void DownloadCommands::ExecuteCommand(Command command) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
   switch (command) {
     case SHOW_IN_FOLDER:
       download_item_->ShowDownloadInShell();
       break;
     case OPEN_WHEN_COMPLETE:
       download_item_->OpenDownload();
       break;
     case ALWAYS_OPEN_TYPE: {
       bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE);
       DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
@@ skipping 47 matching lines @@
       GetBrowser()->OpenURL(content::OpenURLParams(
           GURL(chrome::kDownloadInterruptedLearnMoreURL), content::Referrer(),
           NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false));
       break;
     case PAUSE:
       download_item_->Pause();
       break;
     case RESUME:
       download_item_->Resume();
       break;
-    case RETRY:
-      if (download_item_->CanResume()) {
-        download_item_->Resume();
-      } else {
-        // TODO(yoshiki): Implement retry logic.
-      }
+    case RETRY: {
+      content::DownloadManager* download_manager =
+          content::BrowserContext::GetDownloadManager(
+              download_item_->GetBrowserContext());
+      scoped_ptr<content::DownloadUrlParameters> params(
+          content::DownloadUrlParameters::FromWebContents(
+              download_item_->GetWebContents(), download_item_->GetURL()));

[asanka, 2015/04/22 21:17:35]

DownloadItem::GetWebContents() isn't guaranteed to return a non-null result.
This is going to fail for a substantial number of cases.

+      params->set_referrer(content::Referrer(download_item_->GetReferrerUrl(),
+                           blink::WebReferrerPolicyDefault));
+
+      // Removes the previous donwload item.
+      download_item_->Remove();
+
+      // Starts new download.
+      download_manager->DownloadUrl(params.Pass());
       break;
+    }
   }
 }
 
 Browser* DownloadCommands::GetBrowser() const {
   Profile* profile =
       Profile::FromBrowserContext(download_item_->GetBrowserContext());
   chrome::ScopedTabbedBrowserDisplayer browser_displayer(
       profile, chrome::GetActiveDesktop());
   DCHECK(browser_displayer.browser());
   return browser_displayer.browser();
@@ skipping 13 matching lines @@
     is_adobe_pdf_reader_up_to_date =
         DownloadTargetDeterminer::IsAdobeReaderUpToDate();
   }
   return IsDownloadPdf() &&
          (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
                                           : true);
 #elif defined(OS_MACOSX) || defined(OS_LINUX)
   return IsDownloadPdf();
 #endif
 }