[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 "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_item_model.h"
@@ skipping 22 matching lines @@
 }
 
 int DownloadCommands::GetCommandIconId(Command command) const {
   switch (command) {
     case PAUSE:
       return IDR_DOWNLOAD_NOTIFICATION_MENU_PAUSE;
     case RESUME:
       return IDR_DOWNLOAD_NOTIFICATION_MENU_RESUME;
     case SHOW_IN_FOLDER:
       return IDR_DOWNLOAD_NOTIFICATION_MENU_FOLDER;
-    case RETRY:
     case KEEP:
       return IDR_DOWNLOAD_NOTIFICATION_MENU_DOWNLOAD;
     case DISCARD:
       return IDR_DOWNLOAD_NOTIFICATION_MENU_DELETE;
     case CANCEL:
       // TODO(yoshiki): This is a temporary image for Download Notification
       // feature behind the flag. We have to replace the image with proper one
       // before the feature launch. http://crbug.com/468559
       return IDR_DOWNLOAD_NOTIFICATION_MENU_DELETE;
     case OPEN_WHEN_COMPLETE:
@@ skipping 42 matching lines @@
       return !download_item_->IsDone() && !download_item_->IsPaused() &&
              download_item_->GetState() == content::DownloadItem::IN_PROGRESS;
     case RESUME:
       return download_item_->CanResume() &&
              (download_item_->IsPaused() ||
               download_item_->GetState() != content::DownloadItem::IN_PROGRESS);
     case DISCARD:
     case KEEP:
     case LEARN_MORE_SCANNING:
     case LEARN_MORE_INTERRUPTED:
-    case RETRY:
       return true;
   }
   NOTREACHED();
   return false;
 }
 
 bool DownloadCommands::IsCommandChecked(Command command) const {
   switch (command) {
     case OPEN_WHEN_COMPLETE:
       return download_item_->GetOpenWhenComplete() ||
              download_crx_util::IsExtensionDownload(*download_item_);
     case ALWAYS_OPEN_TYPE:
 #if defined(OS_WIN) || defined(OS_LINUX) || \
     (defined(OS_MACOSX) && !defined(OS_IOS))
       if (CanOpenPdfInSystemViewer()) {
         DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
             download_item_->GetBrowserContext());
         return prefs->ShouldOpenPdfInSystemReader();
       }
 #endif
       return download_item_->ShouldOpenFileBasedOnExtension();
     case PAUSE:
     case RESUME:
       return download_item_->IsPaused();
     case SHOW_IN_FOLDER:
     case PLATFORM_OPEN:
     case CANCEL:
     case DISCARD:
     case KEEP:
-    case RETRY:
     case LEARN_MORE_SCANNING:
     case LEARN_MORE_INTERRUPTED:
       return false;
   }
   return false;
 }
 
 bool DownloadCommands::IsCommandVisible(Command command) const {
   if (command == PLATFORM_OPEN)
     return (DownloadItemModel(download_item_).ShouldPreferOpeningInBrowser());
@@ skipping 62 matching lines @@
       GetBrowser()->OpenURL(content::OpenURLParams(
           GetLearnMoreURLForInterruptedDownload(), 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.
-      }
-      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
 }