| 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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 // menu item, recheck if the download is in progress state before toggling | 130 // menu item, recheck if the download is in progress state before toggling |
| 131 // pause. | 131 // pause. |
| 132 if (download_item_->IsPartialDownload()) { | 132 if (download_item_->IsPartialDownload()) { |
| 133 if (download_item_->IsPaused()) | 133 if (download_item_->IsPaused()) |
| 134 download_item_->Resume(); | 134 download_item_->Resume(); |
| 135 else | 135 else |
| 136 download_item_->Pause(); | 136 download_item_->Pause(); |
| 137 } | 137 } |
| 138 break; | 138 break; |
| 139 case DISCARD: | 139 case DISCARD: |
| 140 download_item_->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD); | 140 download_item_->DiscardDangerousDownload( |
| 141 DownloadItem::DELETE_DUE_TO_USER_DISCARD, |
| 142 DownloadItem::AcquireFileCallback()); |
| 141 break; | 143 break; |
| 142 case KEEP: | 144 case KEEP: |
| 143 download_item_->DangerousDownloadValidated(); | 145 download_item_->ValidateDangerousDownload(); |
| 144 break; | 146 break; |
| 145 case LEARN_MORE_SCANNING: { | 147 case LEARN_MORE_SCANNING: { |
| 146 #if defined(FULL_SAFE_BROWSING) | 148 #if defined(FULL_SAFE_BROWSING) |
| 147 using safe_browsing::DownloadProtectionService; | 149 using safe_browsing::DownloadProtectionService; |
| 148 SafeBrowsingService* sb_service = | 150 SafeBrowsingService* sb_service = |
| 149 g_browser_process->safe_browsing_service(); | 151 g_browser_process->safe_browsing_service(); |
| 150 DownloadProtectionService* protection_service = | 152 DownloadProtectionService* protection_service = |
| 151 (sb_service ? sb_service->download_protection_service() : NULL); | 153 (sb_service ? sb_service->download_protection_service() : NULL); |
| 152 if (protection_service) { | 154 if (protection_service) { |
| 153 protection_service->ShowDetailsForDownload(*download_item_, navigator_); | 155 protection_service->ShowDetailsForDownload(*download_item_, navigator_); |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 malicious_download_menu_model_->AddItemWithStringId( | 293 malicious_download_menu_model_->AddItemWithStringId( |
| 292 DISCARD, IDS_DOWNLOAD_MENU_DISCARD); | 294 DISCARD, IDS_DOWNLOAD_MENU_DISCARD); |
| 293 malicious_download_menu_model_->AddItemWithStringId( | 295 malicious_download_menu_model_->AddItemWithStringId( |
| 294 KEEP, IDS_DOWNLOAD_MENU_KEEP); | 296 KEEP, IDS_DOWNLOAD_MENU_KEEP); |
| 295 malicious_download_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR); | 297 malicious_download_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR); |
| 296 malicious_download_menu_model_->AddItemWithStringId( | 298 malicious_download_menu_model_->AddItemWithStringId( |
| 297 LEARN_MORE_SCANNING, IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING); | 299 LEARN_MORE_SCANNING, IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING); |
| 298 | 300 |
| 299 return malicious_download_menu_model_.get(); | 301 return malicious_download_menu_model_.get(); |
| 300 } | 302 } |
| OLD | NEW |