Revert "Speculative revert by sheriff"

chrome/browser/resources/extensions/extension_list.js

 // Copyright (c) 2012 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.
 
 <include src="extension_error.js">
 
 ///////////////////////////////////////////////////////////////////////////////
 // ExtensionFocusRow:
 
 /**
@@ skipping 267 matching lines @@
       this.extensionsUpdated_ = new Promise(function(resolve, reject) {
         chrome.developerPrivate.getExtensionsInfo(
             {includeDisabled: true, includeTerminated: true},
             function(extensions) {
           // Sort in order of unpacked vs. packed, followed by name, followed by
           // id.
           extensions.sort(compareExtensions);
           this.extensions_ = extensions;
           this.showExtensionNodes_();
           resolve();
-
-          // |onUpdateFinished_| should be called after the list becomes visible
-          // in extensions.js. |resolve| is async, so |onUpdateFinished_|
-          // shouldn't be called directly.
-          this.extensionsUpdated_.then(this.onUpdateFinished_.bind(this));
         }.bind(this));
       }.bind(this));
       return this.extensionsUpdated_;
     },
 
-    /** Updates elements that need to be visible in order to update properly. */
-    onUpdateFinished_: function() {
-      assert(!this.hidden);
-      assert(!this.parentElement.hidden);
-
-      this.updateFocusableElements();
-
-      var idToHighlight = this.getIdQueryParam_();
-      if (idToHighlight && $(idToHighlight))
-        this.scrollToNode_(idToHighlight);
-
-      var idToOpenOptions = this.getOptionsQueryParam_();
-      if (idToOpenOptions && $(idToOpenOptions))
-        this.showEmbeddedExtensionOptions_(idToOpenOptions, true);
-    },
-
     /** @return {number} The number of extensions being displayed. */
     getNumExtensions: function() {
       return this.extensions_.length;
     },
 
     getIdQueryParam_: function() {
       return parseQueryParams(document.location)['id'];
     },
 
     getOptionsQueryParam_: function() {
@@ skipping 29 matching lines @@
               focusableNode.getEquivalentElement(
                   document.activeElement).focus();
             }
           }
 
           node.parentElement.removeChild(node);
           // Unregister the removed node from events.
           assertInstanceof(node, ExtensionFocusRow).destroy();
         }
       }
+
+      var idToHighlight = this.getIdQueryParam_();
+      if (idToHighlight && $(idToHighlight))
+        this.scrollToNode_(idToHighlight);
+
+      var idToOpenOptions = this.getOptionsQueryParam_();
+      if (idToOpenOptions && $(idToOpenOptions))
+        this.showEmbeddedExtensionOptions_(idToOpenOptions, true);
     },
 
     /** Updates each row's focusable elements without rebuilding the grid. */
     updateFocusableElements: function() {
       var rows = document.querySelectorAll('.extension-list-item-wrapper[id]');
       for (var i = 0; i < rows.length; ++i) {
         assertInstanceof(rows[i], ExtensionFocusRow).updateFocusableElements();
       }
     },
 
@@ skipping 698 matching lines @@
         var nextExt = this.extensions_[this.extensions_.indexOf(extension) + 1];
         this.createNode_(extension, nextExt ? $(nextExt.id) : null);
       }
     }
   };
 
   return {
     ExtensionList: ExtensionList
   };
 });