Add a button to chrome://extensions to load an extension.

BUG=20577
TBR=rafaelw@chromium.org

Review URL: http://codereview.chromium.org/177032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24871 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 14 deletions

diff --git a/chrome/browser/resources/extensions_ui.html b/chrome/browser/resources/extensions_ui.html
index b388ea4..d0b8116 100644
--- a/chrome/browser/resources/extensions_ui.html
+++ b/chrome/browser/resources/extensions_ui.html
@@ -185,6 +185,13 @@ var extensionDataFormat = {
  * @param {Object} extensionsData Detailed info about installed extensions
  */
 function showExtensionsData(extensionsData) {
+  // Sort by extension name (case-insensitive)
+  extensionsData.extensions.sort(function(a, b) {
+    a = a.name.toLowerCase();
+    b = b.name.toLowerCase();
+    return a < b ? -1 : (a > b ? 1 : 0);
+  });
+
   // This is the javascript code that processes the template:
   var input = new JsEvalContext(extensionsData);
   var output = document.getElementById('extensionTemplate');
@@ -249,17 +256,13 @@ function handleEnableExtension(node) {
 function handleUninstallExtension(node) {
   // Tell the C++ ExtensionDOMHandler to uninstall an extension.
   chrome.send('uninstall', [node.extensionId]);
+}
 
-  // Find the div above us with class 'extension' and remove it.
-  while (node) {
-    if (node.className == 'extension') {
-      node.parentNode.removeChild(node);
-      return;
-    }
-    node = node.parentNode;
-  }
-
-  throw new Error("Couldn't find containing extension element.");
+/**
+ * Handles the "Load extension..." button being pressed.
+ */
+function loadExtension() {
+  chrome.send('load', []);
 }
 </script>
 </head>
@@ -322,18 +325,15 @@ function handleUninstallExtension(node) {
             </div>
 
           </td>
-          <!--
           <td style="min-width:30px"></td>
           <td style="min-width:30px"></td>
           <td valign="top">
             <h2>Tools</h2>
 
             <div class="sidebar-content">
-              <button>Load Extension...</button><br>
-              <button>Pack Extension...</button>
+              <button onclick="loadExtension()">Load Extension from Directory...</button>
             </div>
           </td>
-          -->
         </tr>
       </table>