| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/download/download_shelf_context_menu.h" | 5 #include "chrome/browser/download/download_shelf_context_menu.h" |
| 6 | 6 |
| 7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/download/download_crx_util.h" | 8 #include "chrome/browser/download/download_crx_util.h" |
| 9 #include "chrome/browser/download/download_item_model.h" | 9 #include "chrome/browser/download/download_item_model.h" |
| 10 #include "chrome/browser/download/download_prefs.h" | 10 #include "chrome/browser/download/download_prefs.h" |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 download_item_->DangerousDownloadValidated(); | 143 download_item_->DangerousDownloadValidated(); |
| 144 break; | 144 break; |
| 145 case LEARN_MORE_SCANNING: { | 145 case LEARN_MORE_SCANNING: { |
| 146 #if defined(FULL_SAFE_BROWSING) | 146 #if defined(FULL_SAFE_BROWSING) |
| 147 using safe_browsing::DownloadProtectionService; | 147 using safe_browsing::DownloadProtectionService; |
| 148 SafeBrowsingService* sb_service = | 148 SafeBrowsingService* sb_service = |
| 149 g_browser_process->safe_browsing_service(); | 149 g_browser_process->safe_browsing_service(); |
| 150 DownloadProtectionService* protection_service = | 150 DownloadProtectionService* protection_service = |
| 151 (sb_service ? sb_service->download_protection_service() : NULL); | 151 (sb_service ? sb_service->download_protection_service() : NULL); |
| 152 if (protection_service) { | 152 if (protection_service) { |
| 153 protection_service->ShowDetailsForDownload( | 153 protection_service->ShowDetailsForDownload(*download_item_, navigator_); |
| 154 DownloadProtectionService::DownloadInfo::FromDownloadItem( | |
| 155 *download_item_), | |
| 156 navigator_); | |
| 157 } | 154 } |
| 158 #else | 155 #else |
| 159 // Should only be getting invoked if we are using safe browsing. | 156 // Should only be getting invoked if we are using safe browsing. |
| 160 NOTREACHED(); | 157 NOTREACHED(); |
| 161 #endif | 158 #endif |
| 162 break; | 159 break; |
| 163 } | 160 } |
| 164 case LEARN_MORE_INTERRUPTED: | 161 case LEARN_MORE_INTERRUPTED: |
| 165 navigator_->OpenURL( | 162 navigator_->OpenURL( |
| 166 content::OpenURLParams(GURL(chrome::kDownloadInterruptedLearnMoreURL), | 163 content::OpenURLParams(GURL(chrome::kDownloadInterruptedLearnMoreURL), |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 malicious_download_menu_model_->AddItemWithStringId( | 291 malicious_download_menu_model_->AddItemWithStringId( |
| 295 DISCARD, IDS_DOWNLOAD_MENU_DISCARD); | 292 DISCARD, IDS_DOWNLOAD_MENU_DISCARD); |
| 296 malicious_download_menu_model_->AddItemWithStringId( | 293 malicious_download_menu_model_->AddItemWithStringId( |
| 297 KEEP, IDS_DOWNLOAD_MENU_KEEP); | 294 KEEP, IDS_DOWNLOAD_MENU_KEEP); |
| 298 malicious_download_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR); | 295 malicious_download_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR); |
| 299 malicious_download_menu_model_->AddItemWithStringId( | 296 malicious_download_menu_model_->AddItemWithStringId( |
| 300 LEARN_MORE_SCANNING, IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING); | 297 LEARN_MORE_SCANNING, IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING); |
| 301 | 298 |
| 302 return malicious_download_menu_model_.get(); | 299 return malicious_download_menu_model_.get(); |
| 303 } | 300 } |
| OLD | NEW |