Keep hackin' on MD downloads

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 24 matching lines @@
 
       /** Only set when |isDangerous| is true. */
       isMalware_: Boolean,
     },
 
     /** @param {!downloads.Data} data */
     update: function(data) {
       assert(!this.id_ || data.id == this.id_);
       this.id_ = data.id;  // This is the only thing saved from |data|.
 
+      // Danger-independent UI and controls.
       this.ensureTextIs_(this.$.since, data.since_string);
       this.ensureTextIs_(this.$.date, data.date_string);
 
+      /** @const */ var noFile =
+          data.state == downloads.States.CANCELLED ||
+          data.state == downloads.States.INTERRUPTED ||
+          data.file_externally_removed;
+      this.$.content.classList.toggle('no-file', noFile);
+
+      this.ensureTextIs_(this.$.name, data.file_name);
+      this.ensureTextIs_(this.$.url, data.url);
+      this.$.url.href = data.url;
+
+      // Danger-dependent UI and controls.
       var dangerText = this.getDangerText_(data);
-      this.isDangerous = !!dangerText;
+      this.isDangerous_ = !!dangerText;
+      this.$.content.classList.toggle('dangerous', this.isDangerous_);
 
-      if (dangerText) {
-        this.ensureTextIs_(this.$.description, dangerText);
+      var description = dangerText || this.getStatusText_(data);
 
+      // Status goes in the "tag" (next to the file name) if there's no file.
+      this.ensureTextIs_(this.$.description, noFile ? '' : description);
+      this.ensureTextIs_(this.$.tag, noFile ? description : '');
+
+      /** @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;
-        var dangerousFile = dangerType == downloads.DangerType.DANGEROUS_FILE;
-        this.$.description.classList.toggle('malware', !dangerousFile);
-
-        var idr = dangerousFile ? 'IDR_WARNING' : 'IDR_SAFEBROWSING_WARNING';
-        var iconUrl = 'chrome://theme/' + idr;
-        this.iconLoader_.loadScaledIcon(this.$['dangerous-icon'], iconUrl);
 
         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;
+        var idr = dangerousFile ? 'IDR_WARNING' : 'IDR_SAFEBROWSING_WARNING';
+        iconUrl += 'theme/' + idr;
       } else {
-        var iconUrl = 'chrome://fileicon/' + encodeURIComponent(data.file_path);
-        this.iconLoader_.loadScaledIcon(this.$['safe-icon'], iconUrl);
-
-        /** @const */ var noFile =
-            data.state == downloads.States.CANCELLED ||
-            data.state == downloads.States.INTERRUPTED ||
-            data.file_externally_removed;
-        this.$.safe.classList.toggle('no-file', noFile);
-
         /** @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.ensureTextIs_(this.$.name, data.file_name);
         this.$.name.hidden = completelyOnDisk;
-
         this.$.show.hidden = !completelyOnDisk;
 
         this.$.retry.hidden = !data.retry;
 
         /** @const */ var isInProgress =
             data.state == downloads.States.IN_PROGRESS;
         this.$.pause.hidden = !isInProgress;
 
         this.$.resume.hidden = !data.resume;
 
         /** @const */ var isPaused = data.state == downloads.States.PAUSED;
         /** @const */ var showCancel = isPaused || isInProgress;
         this.$.cancel.hidden = !showCancel;
 
-        this.$['safe-remove'].hidden = showCancel ||
+        this.$.remove.disabled = showCancel ||
             !loadTimeData.getBoolean('allowDeletingHistory');
 
         /** @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;
         }
 
-        this.ensureTextIs_(this.$['src-url'], data.url);
-        this.$['src-url'].href = data.url;
+        iconUrl += 'fileicon/' + encodeURIComponent(data.file_path);
+      }
 
-        // TODO(dbeam): "Cancelled" should show status next to the file name.
-        this.ensureTextIs_(this.$.status, this.getStatusText_(data));
-
-        /** @const */ var hasPercent = isFinite(data.percent);
-        this.$.progress.hidden = !hasPercent;
-
-        if (hasPercent) {
-          this.$.progress.indeterminate = data.percent < 0;
-          this.$.progress.value = data.percent;
-        }
-      }
+      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 47 matching lines @@
       }
       assertNotReached();
       return '';
     },
 
     /** @private */
     onCancelClick_: function() {
       this.actionService_.cancel(this.id_);
     },
 
-    /** @private */
-    onDangerousRemoveOrDiscardClick_: function() {
-      this.actionService_.discardDangerous(this.id_);
-    },
-
     /**
      * @private
      * @param {Event} e
      */
     onDragStart_: function(e) {
       e.preventDefault();
       this.actionService_.drag(this.id_);
     },
 
     /**
      * @param {Event} e
      * @private
      */
     onFileLinkClick_: function(e) {
       e.preventDefault();
       this.actionService_.openFile(this.id_);
     },
 
     /** @private */
     onPauseClick_: function() {
       this.actionService_.pause(this.id_);
     },
 
     /** @private */
     onRemoveClick_: function() {
-      this.actionService_.remove(this.id_);
+      assert(!this.$.remove.disabled);

[michaelpg, 2015/07/30 02:39:24]

Don't trust Polymer?

[Dan Beam, 2015/07/30 02:43:21]

in assert()s we trust

+
+      if (this.isDangerous_)
+        this.actionService_.discardDangerous(this.id_);
+      else
+        this.actionService_.remove(this.id_);
     },
 
     /** @private */
     onRestoreOrSaveClick_: function() {
       this.actionService_.saveDangerous(this.id_);
     },
 
     /** @private */
     onResumeClick_: function() {
       this.actionService_.resume(this.id_);
@@ skipping 19 matching lines @@
     },
 
     /** @private */
     onShowClick_: function() {
       this.actionService_.show(this.id_);
     },
   });
 
   return {Item: Item};
 });