extensions: reinstate trash focus/closing logic after switch to

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">
 
 /**
  * The type of the extension data object. The definition is based on
  * chrome/browser/ui/webui/extensions/extension_basic_info.cc
  * and
@@ skipping 448 matching lines @@
         trash.classList.add('open');
         trash.classList.toggle('mouse-clicked', e.detail > 0);
         if (this.uninstallIsShowing_)
           return;
         this.uninstallIsShowing_ = true;
         chrome.management.uninstall(extension.id,
                                     {showConfirmDialog: true},
                                     function() {
           // TODO(devlin): What should we do if the uninstall fails?
           this.uninstallIsShowing_ = false;
+
+          if (trash.classList.contains('mouse-clicked'))
+            trash.blur();
+
+          if (chrome.runtime.lastError) {
+            // The uninstall failed (e.g. a cancel). Allow the trash to close.
+            trash.classList.remove('open');
+          } else {
+            // Leave the trash open if the uninstall succeded. Otherwise it can
+            // half-close right before it's removed when the DOM is modified.
+          }
         }.bind(this));
       }.bind(this));
       row.querySelector('.enable-controls').appendChild(trash);
 
       // Developer mode ////////////////////////////////////////////////////////
 
       // The path, if provided by unpacked extension.
       row.setupColumn('.load-path a:first-of-type', 'dev-loadPath', 'click',
                       function(e) {
         chrome.send('extensionSettingsShowPath', [String(extension.id)]);
@@ skipping 413 matching lines @@
         self.optionsShown_ = false;
         $('overlay').removeEventListener('cancelOverlay', f);
       });
 
       // TODO(dbeam): why do we need to focus <extensionoptions> before and
       // after its showing animation? Makes very little sense to me.
       overlay.setInitialFocus();
     },
   };
 
-  ExtensionList.uninstallCancel = function() {
-    var trash = document.querySelector('.trash.open');
-    if (trash.classList.contains('mouse-clicked'))
-      trash.blur();
-    trash.classList.remove('open');
-  };
-
   return {
     ExtensionList: ExtensionList
   };
 });