Make DownloadProtectionService not use BrowserList::GetLastActive() to load a link. Instead pass th…

chrome/browser/download/download_shelf_context_menu.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_shelf_context_menu.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/safe_browsing/download_protection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_switch_utils.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
+#include "content/public/browser/page_navigator.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::DownloadItem;
 using extensions::Extension;
 
 DownloadShelfContextMenu::~DownloadShelfContextMenu() {}
 
 DownloadShelfContextMenu::DownloadShelfContextMenu(
-    BaseDownloadItemModel* download_model)
+    BaseDownloadItemModel* download_model,
+    content::PageNavigator* navigator)
     : download_model_(download_model),
-      download_item_(download_model->download()) {
+      download_item_(download_model->download()),
+      navigator_(navigator) {
 }
 
 ui::SimpleMenuModel* DownloadShelfContextMenu::GetMenuModel() {
   ui::SimpleMenuModel* model = NULL;
   // We shouldn't be opening a context menu for a dangerous download, unless it
   // is a malicious download.
   DCHECK(!download_model_->IsDangerous() || download_model_->IsMalicious());
 
   if (download_model_->IsMalicious())
     model = GetMaliciousMenuModel();
@@ skipping 79 matching lines @@
     case LEARN_MORE: {
 #if defined(ENABLE_SAFE_BROWSING)
       using safe_browsing::DownloadProtectionService;
       SafeBrowsingService* sb_service =
           g_browser_process->safe_browsing_service();
       DownloadProtectionService* protection_service =
           (sb_service ? sb_service->download_protection_service() : NULL);
       if (protection_service) {
         protection_service->ShowDetailsForDownload(
             DownloadProtectionService::DownloadInfo::FromDownloadItem(
-                *download_item_));
+                *download_item_),
+            navigator_);
       }
 #else
       // Should only be getting invoked if we are using safe browsing.
       NOTREACHED();
 #endif
       break;
     }
     default:
       NOTREACHED();
   }
@@ skipping 89 matching lines @@
   malicious_download_menu_model_->AddItemWithStringId(
       DISCARD, IDS_DOWNLOAD_MENU_DISCARD);
   malicious_download_menu_model_->AddItemWithStringId(
       KEEP, IDS_DOWNLOAD_MENU_KEEP);
   malicious_download_menu_model_->AddSeparator();
   malicious_download_menu_model_->AddItemWithStringId(
       LEARN_MORE, IDS_DOWNLOAD_MENU_LEARN_MORE);
 
   return malicious_download_menu_model_.get();
 }