Download WebUI: include file name in remove link aria-label

Bug: 866926
Change-Id: I4811f8cafd4febc39955ea4c076b83fb7c0035a9
Reviewed-on: https://chromium-review.googlesource.com/c/1309094
Commit-Queue: Esmael El-Moslimany <aee@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604466}

chrome/app/generated_resources.grd

@@ -1576,6 +1576,10 @@ are declared in tools/grit/grit_rule.gni.
                desc="In the download view, 'Remove from list' link text">
         Remove from list
       </message>
+      <message name="IDS_DOWNLOAD_LINK_REMOVE_ARIA_LABEL"
+               desc="In the download view, 'Remove from list' link aria-label">
+        Remove <ph name="FILE_NAME">$1<ex>somedocument.pdf</ex></ph> from list
+      </message>
       <message name="IDS_DOWNLOAD_LINK_CANCEL"
                desc="In the download view, 'Cancel' link text">
         Cancel

chrome/browser/resources/md_downloads/item.html

@@ -308,7 +308,7 @@
             style$="[[computeRemoveStyle_(isDangerous_, showCancel_)]]">
           <button id="remove"
               title="$i18n{controlRemoveFromList}"
-              aria-label="$i18n{controlRemoveFromList}"
+              aria-label$="[[controlRemoveFromListAriaLabel_]]"
               on-click="onRemoveTap_"></button>
         </paper-icon-button-light>
       </div>

chrome/browser/resources/md_downloads/item.js

@@ -7,8 +7,10 @@ cr.define('downloads', function() {
     is: 'downloads-item',
 
     properties: {
+      /** @type {!downloads.Data} */
       data: Object,
 
+      /** @private */
       completelyOnDisk_: {
         computed: 'computeCompletelyOnDisk_(' +
             'data.state, data.file_externally_removed)',
@@ -16,12 +18,20 @@ cr.define('downloads', function() {
         value: true,
       },
 
+      /** @private */
       controlledBy_: {
         computed: 'computeControlledBy_(data.by_ext_id, data.by_ext_name)',
         type: String,
         value: '',
       },
 
+      /** @private */
+      controlRemoveFromListAriaLabel_: {
+        type: String,
+        computed: 'computeControlRemoveFromListAriaLabel_(data.file_name)',
+      },
+
+      /** @private */
       isActive_: {
         computed: 'computeIsActive_(' +
             'data.state, data.file_externally_removed)',
@@ -29,40 +39,47 @@ cr.define('downloads', function() {
         value: true,
       },
 
+      /** @private */
       isDangerous_: {
         computed: 'computeIsDangerous_(data.state)',
         type: Boolean,
         value: false,
       },
 
+      /** @private */
       isMalware_: {
         computed: 'computeIsMalware_(isDangerous_, data.danger_type)',
         type: Boolean,
         value: false,
       },
 
+      /** @private */
       isInProgress_: {
         computed: 'computeIsInProgress_(data.state)',
         type: Boolean,
         value: false,
       },
 
+      /** @private */
       pauseOrResumeClass_: {
         computed: 'computePauseOrResumeClass_(isInProgress_, data.resume)',
         type: String,
       },
 
+      /** @private */
       pauseOrResumeText_: {
         computed: 'computePauseOrResumeText_(isInProgress_, data.resume)',
         type: String,
       },
 
+      /** @private */
       showCancel_: {
         computed: 'computeShowCancel_(data.state)',
         type: Boolean,
         value: false,
       },
 
+      /** @private */
       showProgress_: {
         computed: 'computeShowProgress_(showCancel_, data.percent)',
         type: Boolean,
@@ -111,13 +128,19 @@ cr.define('downloads', function() {
       return classes.join(' ');
     },
 
-    /** @private */
+    /**
+     * @return {boolean}
+     * @private
+     */
     computeCompletelyOnDisk_: function() {
       return this.data.state == downloads.States.COMPLETE &&
           !this.data.file_externally_removed;
     },
 
-    /** @private */
+    /**
+     * @return {string}
+     * @private
+     */
     computeControlledBy_: function() {
       if (!this.data.by_ext_id || !this.data.by_ext_name)
         return '';
@@ -127,12 +150,27 @@ cr.define('downloads', function() {
       return loadTimeData.getStringF('controlledByUrl', url, HTMLEscape(name));
     },
 
-    /** @private */
+    /**
+     * @return {string}
+     * @private
+     */
+    computeControlRemoveFromListAriaLabel_: function() {
+      return loadTimeData.getStringF(
+          'controlRemoveFromListAriaLabel', this.data.file_name);
+    },
+
+    /**
+     * @return {string}
+     * @private
+     */
     computeDangerIcon_: function() {
       return this.isDangerous_ ? 'cr:warning' : '';
     },
 
-    /** @private */
+    /**
+     * @return {string}
+     * @private
+     */
     computeDate_: function() {
       assert(typeof this.data.hideDate == 'boolean');
       if (this.data.hideDate)
@@ -140,7 +178,10 @@ cr.define('downloads', function() {
       return assert(this.data.since_string || this.data.date_string);
     },
 
-    /** @private */
+    /**
+     * @return {string}
+     * @private
+     */
     computeDescription_: function() {
       const data = this.data;
 
@@ -172,24 +213,36 @@ cr.define('downloads', function() {
       return '';
     },
 
-    /** @private */
+    /**
+     * @return {boolean}
+     * @private
+     */
     computeIsActive_: function() {
       return this.data.state != downloads.States.CANCELLED &&
           this.data.state != downloads.States.INTERRUPTED &&
           !this.data.file_externally_removed;
     },
 
-    /** @private */
+    /**
+     * @return {boolean}
+     * @private
+     */
     computeIsDangerous_: function() {
       return this.data.state == downloads.States.DANGEROUS;
     },
 
-    /** @private */
+    /**
+     * @return {boolean}
+     * @private
+     */
     computeIsInProgress_: function() {
       return this.data.state == downloads.States.IN_PROGRESS;
     },
 
-    /** @private */
+    /**
+     * @return {boolean}
+     * @private
+     */
     computeIsMalware_: function() {
       return this.isDangerous_ &&
           (this.data.danger_type == downloads.DangerType.DANGEROUS_CONTENT ||
@@ -209,7 +262,10 @@ cr.define('downloads', function() {
       return !this.isInProgress_ && this.data.resume ? 'action-button' : '';
     },
 
-    /** @private */
+    /**
+     * @return {string}
+     * @private
+     */
     computePauseOrResumeText_: function() {
       if (this.data === undefined)
         return '';
@@ -221,25 +277,37 @@ cr.define('downloads', function() {
       return '';
     },
 
-    /** @private */
+    /**
+     * @return {string}
+     * @private
+     */
     computeRemoveStyle_: function() {
       const canDelete = loadTimeData.getBoolean('allowDeletingHistory');
       const hideRemove = this.isDangerous_ || this.showCancel_ || !canDelete;
       return hideRemove ? 'visibility: hidden' : '';
     },
 
-    /** @private */
+    /**
+     * @return {boolean}
+     * @private
+     */
     computeShowCancel_: function() {
       return this.data.state == downloads.States.IN_PROGRESS ||
           this.data.state == downloads.States.PAUSED;
     },
 
-    /** @private */
+    /**
+     * @return {boolean}
+     * @private
+     */
     computeShowProgress_: function() {
       return this.showCancel_ && this.data.percent >= -1;
     },
 
-    /** @private */
+    /**
+     * @return {string}
+     * @private
+     */
     computeTag_: function() {
       switch (this.data.state) {
         case downloads.States.CANCELLED:
@@ -257,7 +325,10 @@ cr.define('downloads', function() {
       return '';
     },
 
-    /** @private */
+    /**
+     * @return {boolean}
+     * @private
+     */
     isIndeterminate_: function() {
       return this.data.percent == -1;
     },

chrome/browser/ui/webui/md_downloads/md_downloads_ui.cc

@@ -82,6 +82,8 @@ content::WebUIDataSource* CreateDownloadsUIHTMLSource(Profile* profile) {
   source->AddLocalizedString("controlCancel", IDS_DOWNLOAD_LINK_CANCEL);
   source->AddLocalizedString("controlResume", IDS_DOWNLOAD_LINK_RESUME);
   source->AddLocalizedString("controlRemoveFromList", IDS_DOWNLOAD_LINK_REMOVE);
+  source->AddLocalizedString("controlRemoveFromListAriaLabel",
+                             IDS_DOWNLOAD_LINK_REMOVE_ARIA_LABEL);
   source->AddLocalizedString("controlRetry", IDS_MD_DOWNLOAD_LINK_RETRY);
   source->AddLocalizedString("controlledByUrl", IDS_DOWNLOAD_BY_EXTENSION_URL);