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

Unified Diff: chrome/browser/download/download_item_model.cc

Issue 19863005: Warn users about potentially unwanted downloads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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/download/download_item_model.cc
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
index f8dc3dbfa66c46406ee0cc41f1783939bb50585d..1ee375084435a4a57909b5e6a1b2080557985ca3 100644
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -329,12 +329,19 @@ string16 DownloadItemModel::GetWarningText(const gfx::Font& font,
ui::ElideFilename(download_->GetFileNameToReportUser(),
font, base_width));
+ case content::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED:
+ return l10n_util::GetStringFUTF16(
+ IDS_PROMPT_POTENTIALLY_UNWANTED_DOWNLOAD,
+ ui::ElideFilename(download_->GetFileNameToReportUser(),
benjhayden 2013/07/22 20:16:19 pre-compute elided_filename to reduce code duplica
asanka 2013/07/23 15:10:36 Done.
+ font, base_width));
+
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:
- NOTREACHED();
+ break;
}
+ NOTREACHED();
return string16();
}
@@ -378,6 +385,7 @@ bool DownloadItemModel::IsMalicious() const {
case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
+ case content::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED:
return true;
case content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS:

Powered by Google App Engine
This is Rietveld 408576698