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

Unified Diff: chrome/browser/resources/downloads.js

Issue 8558029: Update download page to deal with new DANGEROUS_CONTENT state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Also active_downloads.js Created 9 years, 1 month 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/resources/downloads.js
diff --git a/chrome/browser/resources/downloads.js b/chrome/browser/resources/downloads.js
index ec8148d73190174dd9edaba75b849c0de17d34f1..5b02a0f1ddf8ceb3d668c32323d11417e6a313a5 100644
--- a/chrome/browser/resources/downloads.js
+++ b/chrome/browser/resources/downloads.js
@@ -305,6 +305,7 @@ Download.DangerType = {
NOT_DANGEROUS: "NOT_DANGEROUS",
DANGEROUS_FILE: "DANGEROUS_FILE",
DANGEROUS_URL: "DANGEROUS_URL",
+ DANGEROUS_CONTENT: "DANGEROUS_CONTENT"
Randy Smith (Not in Mondays) 2011/11/21 01:18:15 I presume you've thought about the downloads page
benjhayden 2011/11/21 16:21:55 It looks to me like Download.prototype.update supp
asanka 2011/11/21 17:08:57 I verified the behavior manually for the downloads
}
/**
@@ -347,6 +348,7 @@ Download.prototype.update = function(download) {
this.dangerDesc_.textContent = localStrings.getStringF('danger_file_desc',
this.fileName_);
} else {
+ // This is used by both DANGEROUS_URL and DANGEROUS_CONTENT.
this.dangerDesc_.textContent = localStrings.getString('danger_url_desc');
}
this.danger_.style.display = 'block';
@@ -462,6 +464,7 @@ Download.prototype.getStatusText_ = function() {
case Download.States.PAUSED:
return localStrings.getString('status_paused');
case Download.States.DANGEROUS:
+ // danger_url_desc is also used by DANGEROUS_CONTENT
var desc = this.dangerType_ == Download.DangerType.DANGEROUS_FILE ?
'danger_file_desc' : 'danger_url_desc';
return localStrings.getString(desc);
« chrome/browser/resources/active_downloads.js ('K') | « chrome/browser/resources/active_downloads.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698