Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3565)

Unified Diff: chrome/browser/ui/webui/downloads_dom_handler.cc

Issue 14947007: [Downloads] Allow acquiring dangerous download file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename methods for consistency Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/downloads_dom_handler.cc
diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc
index fc22628aeb1fd5f251c50d651c234be1764705e5..c5c6ff89efb35604624f1a861c0befa4e465577e 100644
--- a/chrome/browser/ui/webui/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads_dom_handler.cc
@@ -372,7 +372,9 @@ void DownloadsDOMHandler::HandleDiscardDangerous(const base::ListValue* args) {
CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_DISCARD_DANGEROUS);
content::DownloadItem* file = GetDownloadByValue(args);
if (file)
- file->Delete(content::DownloadItem::DELETE_DUE_TO_USER_DISCARD);
+ file->DiscardDangerousDownload(
+ content::DownloadItem::DELETE_DUE_TO_USER_DISCARD,
+ content::DownloadItem::AcquireFileCallback());
}
void DownloadsDOMHandler::HandleShow(const base::ListValue* args) {
@@ -513,7 +515,7 @@ void DownloadsDOMHandler::DangerPromptAccepted(int download_id) {
if (!item || (item->GetState() != content::DownloadItem::IN_PROGRESS))
return;
CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
- item->DangerousDownloadValidated();
+ item->ValidateDangerousDownload();
}
bool DownloadsDOMHandler::IsDeletingHistoryAllowed() {

Powered by Google App Engine
This is Rietveld 408576698