Extensions UI page should not allow Reload forextensions that are not 'in development' andshould not DCHECK when uninstalling a disabledextension.I also reordered the links on the page, now thatwe show the Reload link conditionally, sinceit is weird to enable extensions after this change.The order starts out as...Disable - Reload - Uninstall... then when you press Disable it becomes: Enable - Uninstallpress Enable, it becomes:Disable - Reload - UninstallNotice how the Reload link pops up where Enable linkwas and where you'd expect Disable to be?TEST=Open chrome://extensions and make sure extensionsloaded with --load-extension have the Reload optionand when you disable an extension it does not DCHECKin debug version of Chrome.BUG=http://crbug.com/26901, http://crbug.com/26910

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

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

1 files changed, 10 insertions, 8 deletions

diff --git a/chrome/browser/resources/extensions_ui.html b/chrome/browser/resources/extensions_ui.html
index 8873aa0..fa27d72 100644
--- a/chrome/browser/resources/extensions_ui.html
+++ b/chrome/browser/resources/extensions_ui.html
@@ -258,6 +258,7 @@ var extensionDataFormat = {
       "description": "Extension long format description",
       "version": "1.0.231",
       "enabled": "true",
+      "allow_reload": true,
       "order": 1,
       "options_url": "options.html",
       "icon": "relative-path-to-icon.png",
@@ -296,6 +297,7 @@ var extensionDataFormat = {
       "description": "Extension long format description",
       "version": "1.0.231",
       "enabled": "true",
+      "allow_reload": false,
       "order": 2,
       "icon": "",
       "content_scripts": [
@@ -694,6 +696,14 @@ function autoUpdate() {
               <span class="extension-actions">
                 <a
                   jsvalues=".extensionId:id"
+                  jsdisplay="enabled && allow_reload"
+                  onclick="handleReloadExtension(this)"
+                  href="javascript:void();"
+                  i18n-content="reload"
+                  >RELOAD</a>
+                <span jsdisplay="enabled && allow_reload">-</span>
+                <a
+                  jsvalues=".extensionId:id"
                   jsdisplay="enabled"
                   onclick="handleEnableExtension(this, false)"
                   href="javascript:void();"
@@ -708,14 +718,6 @@ function autoUpdate() {
                   >ENABLE</a> -
                 <a
                   jsvalues=".extensionId:id"
-                  jsdisplay="enabled"
-                  onclick="handleReloadExtension(this)"
-                  href="javascript:void();"
-                  i18n-content="reload"
-                  >RELOAD</a>
-                <span jsdisplay="enabled">-</span>
-                <a
-                  jsvalues=".extensionId:id"
                   onclick="handleUninstallExtension(this)"
                   href="javascript:void();"
                   i18n-content="uninstall"