MD Downloads: fix focus issue on downloads page by combining pause/play

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',
 
     properties: {
       data: {
@@ skipping 19 matching lines @@
         type: Boolean,
         value: true,
       },
 
       isDangerous_: {
         computed: 'computeIsDangerous_(data.state)',
         type: Boolean,
         value: false,
       },
 
+      isMalware_: {
+        computed: 'computeIsMalware_(isDangerous_, data.danger_type)',
+        type: Boolean,
+        value: false,
+      },
+
       isInProgress_: {
         computed: 'computeIsInProgress_(data.state)',
         type: Boolean,
         value: false,
       },
 
+      pauseOrResumeText_: {
+        computed: 'computePauseOrResumeText_(isInProgress_, data.resume)',
+        type: String,
+      },
+
       showCancel_: {
         computed: 'computeShowCancel_(data.state)',
         type: Boolean,
         value: false,
       },
 
       showProgress_: {
         computed: 'computeShowProgress_(showCancel_, data.percent)',
         type: Boolean,
         value: false,
       },
-
-      isMalware_: {
-        computed: 'computeIsMalware_(isDangerous_, data.danger_type)',
-        type: Boolean,
-        value: false,
-      },
     },
 
     observers: [
       // TODO(dbeam): this gets called way more when I observe data.by_ext_id
       // and data.by_ext_name directly. Why?
       'observeControlledBy_(controlledBy_)',
       'observeIsDangerous_(isDangerous_, data)',
     ],
 
     ready: function() {
@@ skipping 107 matching lines @@
     /** @private */
     computeIsMalware_: function() {
       return this.isDangerous_ &&
           (this.data.danger_type == downloads.DangerType.DANGEROUS_CONTENT ||
            this.data.danger_type == downloads.DangerType.DANGEROUS_HOST ||
            this.data.danger_type == downloads.DangerType.DANGEROUS_URL ||
            this.data.danger_type == downloads.DangerType.POTENTIALLY_UNWANTED);
     },
 
     /** @private */
+    computePauseOrResumeText_: function() {
+      if (this.isInProgress_)
+        return loadTimeData.getString('controlPause');
+      if (this.data.resume)
+        return loadTimeData.getString('controlResume');
+      return '';
+    },
+
+    /** @private */
     computeRemoveStyle_: function() {
       var canDelete = loadTimeData.getBoolean('allowDeletingHistory');
       var hideRemove = this.isDangerous_ || this.showCancel_ || !canDelete;
       return hideRemove ? 'visibility: hidden' : '';
     },
 
     /** @private */
     computeShowCancel_: function() {
       return this.data.state == downloads.States.IN_PROGRESS ||
              this.data.state == downloads.States.PAUSED;
@@ skipping 68 matching lines @@
     /**
      * @param {Event} e
      * @private
      */
     onFileLinkTap_: function(e) {
       e.preventDefault();
       downloads.ActionService.getInstance().openFile(this.data.id);
     },
 
     /** @private */
-    onPauseTap_: function() {
-      downloads.ActionService.getInstance().pause(this.data.id);
+    onPauseOrResumeTap_: function() {
+      if (this.isInProgress_)
+        downloads.ActionService.getInstance().pause(this.data.id);
+      else
+        downloads.ActionService.getInstance().resume(this.data.id);
     },
 
     /** @private */
     onRemoveTap_: function() {
       downloads.ActionService.getInstance().remove(this.data.id);
     },
 
     /** @private */
-    onResumeTap_: function() {
-      downloads.ActionService.getInstance().resume(this.data.id);
-    },
-
-    /** @private */
     onRetryTap_: function() {
       downloads.ActionService.getInstance().download(this.data.url);
     },
 
     /** @private */
     onSaveDangerousTap_: function() {
       downloads.ActionService.getInstance().saveDangerous(this.data.id);
     },
 
     /** @private */
     onShowTap_: function() {
       downloads.ActionService.getInstance().show(this.data.id);
     },
   });
 
   return {Item: Item};
 });