[Download Notification] Refine retry logic when interrupted or cancelled

chrome/browser/download/notification/download_notification_item.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/notification/download_notification_item.h"
 
 #include "base/strings/string_number_conversions.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/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/profile_notification.h"
+#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/download_item.h"
+#include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
 
 namespace {
 
 const char kDownloadNotificationNotifierId[] =
     "chrome://downloads/notification/id-notifier";
@@ skipping 76 matching lines @@
   UpdateNotificationData(ADD_NEW);
 }
 
 DownloadNotificationItem::~DownloadNotificationItem() {
   if (item_)
     item_->RemoveObserver(this);
 }
 
 void DownloadNotificationItem::OnNotificationClick() {
   if (openable_) {
-    if (item_->IsDone())
+    if (item_->IsDone()) {
       item_->OpenDownload();
-    else
+      CloseNotificationByUser();
+    } else {
       item_->SetOpenWhenComplete(!item_->GetOpenWhenComplete());  // Toggle
+    }
+  } else if (item_->GetState() == content::DownloadItem::INTERRUPTED ||
+             item_->GetState() == content::DownloadItem::CANCELLED) {
+    GetBrowser()->OpenURL(content::OpenURLParams(
+        GURL(chrome::kChromeUIDownloadsURL), content::Referrer(),
+        NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
+        false /* is_renderer_initiated */));
+    CloseNotificationByUser();
+  } else if (item_->IsDone()) {
+    CloseNotificationByUser();
   }
-
-  if (item_->IsDone())
-    CloseNotificationByUser();
 }
 
 void DownloadNotificationItem::OnNotificationButtonClick(int button_index) {
   if (button_index < 0 ||
       static_cast<size_t>(button_index) >= button_actions_->size()) {
     // Out of boundary.
     NOTREACHED();
     return;
   }
 
@@ skipping 189 matching lines @@
     case content::DownloadItem::IN_PROGRESS:
       actions->push_back(DownloadCommands::OPEN_WHEN_COMPLETE);
       if (!item_->IsPaused())
         actions->push_back(DownloadCommands::PAUSE);
       else
         actions->push_back(DownloadCommands::RESUME);
       actions->push_back(DownloadCommands::CANCEL);
       break;
     case content::DownloadItem::CANCELLED:
     case content::DownloadItem::INTERRUPTED:
-      actions->push_back(DownloadCommands::RETRY);
+      if (item_->CanResume())
+        actions->push_back(DownloadCommands::RETRY);
       break;
     case content::DownloadItem::COMPLETE:
       actions->push_back(DownloadCommands::OPEN_WHEN_COMPLETE);
       actions->push_back(DownloadCommands::SHOW_IN_FOLDER);
       break;
     case content::DownloadItem::MAX_DOWNLOAD_STATE:
       NOTREACHED();
   }
   return actions.Pass();
 }
@@ skipping 40 matching lines @@
       break;
     case DownloadCommands::RESUME:
       // Only for non menu.
       id = IDS_DOWNLOAD_LINK_RESUME;
       break;
     case DownloadCommands::SHOW_IN_FOLDER:
       id = IDS_DOWNLOAD_LINK_SHOW;
       break;
     case DownloadCommands::RETRY:
       // Only for non menu.
       id = IDS_DOWNLOAD_LINK_RETRY;

[yoshiki, 2015/05/14 01:21:45]

Note that this string is still used by other places.

       break;
     case DownloadCommands::DISCARD:
       id = IDS_DISCARD_DOWNLOAD;
       break;
     case DownloadCommands::KEEP:
       id = IDS_CONFIRM_DOWNLOAD;
       break;
     case DownloadCommands::CANCEL:
       id = IDS_DOWNLOAD_LINK_CANCEL;
       break;
@@ skipping 43 matching lines @@
     case content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS:
     case content::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT:
     case content::DOWNLOAD_DANGER_TYPE_USER_VALIDATED:
     case content::DOWNLOAD_DANGER_TYPE_MAX: {
       break;
     }
   }
   NOTREACHED();
   return base::string16();
 }
+
+Browser* DownloadNotificationItem::GetBrowser() {
+  chrome::ScopedTabbedBrowserDisplayer browser_displayer(
+      profile_, chrome::GetActiveDesktop());
+  DCHECK(browser_displayer.browser());
+  return browser_displayer.browser();
+}