commit ead446a77684e0b9e6bca3de187dcc1544104e3e
author dbeam <dbeam@chromium.org> Tue Mar 03 03:13:23 2015
committer Commit bot <commit-bot@chromium.org> Tue Mar 03 03:14:06 2015
tree 27d3d1c74e24c3bcb2ea21bf1c96fbf6adc8b5b0
parent 6014e9a164d3f17b96027dd9c090b06ce9614f7d

extensions: reinstate trash focus/closing logic after switch to
chrome.management.uninstall.

R=rdevlin.cronin@chromium.org
BUG=463003

Review URL: https://codereview.chromium.org/971993002

Cr-Commit-Position: refs/heads/master@{#318825}

chrome/browser/resources/extensions/extension_list.js

diff --git a/chrome/browser/resources/extensions/extension_list.js b/chrome/browser/resources/extensions/extension_list.js
index a9363e1..16b1132 100644
--- a/chrome/browser/resources/extensions/extension_list.js
+++ b/chrome/browser/resources/extensions/extension_list.js
@@ -466,6 +466,17 @@
                                     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);
@@ -899,13 +910,6 @@
     },
   };
 
-  ExtensionList.uninstallCancel = function() {
-    var trash = document.querySelector('.trash.open');
-    if (trash.classList.contains('mouse-clicked'))
-      trash.blur();
-    trash.classList.remove('open');
-  };
-
   return {
     ExtensionList: ExtensionList
   };