MD downloads: implement real warning icon

chrome/browser/resources/md_downloads/item.js

 // Copyright 2015 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.
 
 cr.define('downloads', function() {
   var Item = Polymer({
     is: 'downloads-item',
 
     /**
      * @param {!downloads.ThrottledIconLoader} iconLoader
@@ skipping 67 matching lines @@
 
       /** @const */ var showProgress =
           isFinite(data.percent) && !this.isDangerous_;
       this.$.progress.hidden = !showProgress;
 
       if (showProgress) {
         this.$.progress.indeterminate = data.percent < 0;
         this.$.progress.value = data.percent;
       }
 
-      var iconUrl = 'chrome://';
-
       if (this.isDangerous_) {
-        var dangerType = data.danger_type;
-
         this.isMalware_ =
-            dangerType == downloads.DangerType.DANGEROUS_CONTENT ||
-            dangerType == downloads.DangerType.DANGEROUS_HOST ||
-            dangerType == downloads.DangerType.DANGEROUS_URL ||
-            dangerType == downloads.DangerType.POTENTIALLY_UNWANTED;
-
-        // TODO(dbeam): this icon sucks: it's a PNG we have to scale and looks
-        // nothing like the mocks. Find a prettier, more vectorized version.
-        var dangerousFile = dangerType == downloads.DangerType.DANGEROUS_FILE;

[groby-ooo-7-16, 2015/08/04 00:56:06]

I'm slightly confused. Who's setting up the URL for the icon now? Did we
intentionally switch to just file_path?

[Dan Beam, 2015/08/04 01:11:20]

the new UI shows the same warning icon regardless of danger type

-        var idr = dangerousFile ? 'IDR_WARNING' : 'IDR_SAFEBROWSING_WARNING';
-        iconUrl += 'theme/' + idr;
+            data.danger_type == downloads.DangerType.DANGEROUS_CONTENT ||
+            data.danger_type == downloads.DangerType.DANGEROUS_HOST ||
+            data.danger_type == downloads.DangerType.DANGEROUS_URL ||
+            data.danger_type == downloads.DangerType.POTENTIALLY_UNWANTED;
       } else {
         /** @const */ var completelyOnDisk =
             data.state == downloads.States.COMPLETE &&
             !data.file_externally_removed;
 
         this.$['file-link'].href = data.url;
         this.ensureTextIs_(this.$['file-link'], data.file_name);
 
         this.$['file-link'].hidden = !completelyOnDisk;
         this.$.name.hidden = completelyOnDisk;
@@ skipping 17 matching lines @@
         /** @const */ var controlledByExtension = data.by_ext_id &&
                                                   data.by_ext_name;
         this.$['controlled-by'].hidden = !controlledByExtension;
         if (controlledByExtension) {
           var link = this.$['controlled-by'].querySelector('a');
           link.href = 'chrome://extensions#' + data.by_ext_id;
           link.setAttribute('column-type', 'controlled-by');
           link.textContent = data.by_ext_name;
         }
 
-        iconUrl += 'fileicon/' + encodeURIComponent(data.file_path);
+        var icon = 'chrome://fileicon/' + encodeURIComponent(data.file_path);
+        this.iconLoader_.loadScaledIcon(this.$.icon, icon);
       }
-
-      this.iconLoader_.loadScaledIcon(this.$.icon, iconUrl);
     },
 
     /**
      * Overwrite |el|'s textContent if it differs from |text|.
      * @param {!Element} el
      * @param {string} text
      * @private
      */
     ensureTextIs_: function(el, text) {
       if (el.textContent != text)
@@ skipping 117 matching lines @@
     },
 
     /** @private */
     onShowClick_: function() {
       this.actionService_.show(this.id_);
     },
   });
 
   return {Item: Item};
 });