downloads: fix Resume/Pause focus regression.

chrome/browser/resources/downloads/manager.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() {
   /**
    * Class to own and manage download items.
    * @constructor
    */
   function Manager() {}
@@ skipping 90 matching lines @@
     },
 
     /** @param {!downloads.Data} data Info about the item to update. */
     updateItem: function(data) {
       var activeElement = document.activeElement;
 
       var item = this.idMap_[data.id];
       item.render(data);
       var focusRow = this.decorateItem_(item);
 
-      if (activeElement != document.activeElement)
+      if (focusRow.contains(activeElement) &&
+          !downloads.FocusRow.shouldFocus(activeElement)) {
         focusRow.getEquivalentElement(activeElement).focus();
+      }
     },
 
     /**
      * Rebuild the focusGrid_ using the elements that each download will have.
      * @private
      */
     rebuildFocusGrid_: function() {
       var activeElement = document.activeElement;
 
       /** @private {!cr.ui.FocusGrid} */
       this.focusGrid_ = this.focusGrid_ || new cr.ui.FocusGrid();
       this.focusGrid_.destroy();
 
       this.items_.forEach(function(item) {
         var focusRow = this.decorateItem_(item);
         this.focusGrid_.addRow(focusRow);
 
-        if (activeElement != document.activeElement &&
-            focusRow.contains(activeElement)) {
+        if (focusRow.contains(activeElement) &&
+            !downloads.FocusRow.shouldFocus(activeElement)) {
           focusRow.getEquivalentElement(activeElement).focus();
         }
       }, this);
     },
 
     /**
      * @param {!downloads.Item} item An item to decorate as a FocusRow.
      * @return {!downloads.FocusRow} |item| decorated as a FocusRow.
      */
     decorateItem_: function(item) {
@@ skipping 75 matching lines @@
   };
 
   Manager.size = function() {
     return Manager.getInstance().size();
   };
 
   return {Manager: Manager};
 });
 
 window.addEventListener('DOMContentLoaded', downloads.Manager.onLoad);