summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authordhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-14 15:40:42 +0000
committerdhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-14 15:40:42 +0000
commitd15012168dcf10d9a1493c902df4fd2215cb5cb3 (patch)
tree81f54429500c2a3e8b5650a7098df28e0b638438 /chrome/browser/resources
parent51b3af3a834fcfe82edf1dc50880ac4f127b431c (diff)
downloadchromium_src-d15012168dcf10d9a1493c902df4fd2215cb5cb3.zip
chromium_src-d15012168dcf10d9a1493c902df4fd2215cb5cb3.tar.gz
chromium_src-d15012168dcf10d9a1493c902df4fd2215cb5cb3.tar.bz2
Chaning filebrowse so when the user downloads a dangerous URL, it doesn't show the updates about the download until the user presses allow. (much like the standard UI)
BUG=chromium-os:2773 TEST=none Review URL: http://codereview.chromium.org/2130001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/filebrowse.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/resources/filebrowse.html b/chrome/browser/resources/filebrowse.html
index 48ed2cb..9011ca5 100644
--- a/chrome/browser/resources/filebrowse.html
+++ b/chrome/browser/resources/filebrowse.html
@@ -1032,6 +1032,7 @@ function downloadUpdated(results) {
no.className = 'link';
pauseDiv.appendChild(yes);
pauseDiv.appendChild(no);
+ progressDiv.textContent = '';
} else if (results[x].state == "PAUSED") {
pauseDiv.textContent = kResumeDownload;
} else if (results[x].state == "IN_PROGRESS") {
@@ -1040,8 +1041,7 @@ function downloadUpdated(results) {
pauseDiv.id = 'downloaditem' + results[x].id;
element.appendChild(pauseDiv);
}
- if (results[x].state != "DANGEROUS" ||
- results[x].percent < 100) {
+ if (results[x].percent < 100) {
progressDiv.textContent = results[x].progress_status_text;
}