Update download page to deal with new DANGEROUS_CONTENT state.

chrome/browser/resources/downloads.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 ///////////////////////////////////////////////////////////////////////////////
 // Helper functions
 function $(o) {return document.getElementById(o);}
 
 /**
  * Sets the display style of a node.
@@ skipping 287 matching lines @@
   INTERRUPTED : "INTERRUPTED",
 }
 
 /**
  * Explains why a download is in DANGEROUS state.
  */
 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 and don't believe that the
safe->dangerous transition will cause any UI problems?  (I don't think so, but I
think you're in a better position to say than I am.)

[benjhayden, 2011/11/21 16:21:55]

It looks to me like Download.prototype.update supports this, but a manual test
would make me feel better. :-)

[asanka, 2011/11/21 17:08:57]

I verified the behavior manually for the downloads page. I've yet to verify it
for the active_downloads page.

 }
 
 /**
  * Constants for the progress meter.
  */
 Download.Progress = {
   width : 48,
   height : 48,
   radius : 24,
   centerX : 24,
@@ skipping 22 matching lines @@
   // See DownloadItem::PercentComplete
   this.percent_ = Math.max(download.percent, 0);
   this.progressStatusText_ = download.progress_status_text;
   this.received_ = download.received;
 
   if (this.state_ == Download.States.DANGEROUS) {
     if (this.dangerType_ == Download.DangerType.DANGEROUS_FILE) {
       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';
     this.safe_.style.display = 'none';
   } else {
     this.nodeImg_.src = 'chrome://fileicon/' + this.filePath_;
 
     if (this.state_ == Download.States.COMPLETE &&
         !this.fileExternallyRemoved_) {
       this.nodeFileLink_.textContent = this.fileName_;
@@ skipping 95 matching lines @@
  */
 Download.prototype.getStatusText_ = function() {
   switch (this.state_) {
     case Download.States.IN_PROGRESS:
       return this.progressStatusText_;
     case Download.States.CANCELLED:
       return localStrings.getString('status_cancelled');
     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);
     case Download.States.INTERRUPTED:
       return localStrings.getString('status_interrupted');
     case Download.States.COMPLETE:
       return this.fileExternallyRemoved_ ?
           localStrings.getString('status_removed') : '';
   }
 }
@@ skipping 162 matching lines @@
 openDownloadsFolderLink.oncontextmenu = function() { return false; };
 
 $('search-link').onclick = function () {
   setSearch('');
   return false;
 };
 $('search-form').onsubmit = function () {
   setSearch(this.term.value);
   return false;
 };