summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extensions_ui.cc
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 20:28:34 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 20:28:34 +0000
commitd5471d936f1fa0be56453a92fd8917d9101ec0bd (patch)
tree7d4376c8b34efa812cba19ab77765e7cdf07924b /chrome/browser/extensions/extensions_ui.cc
parentdefe0b9b574f2a2a8399d51f03f75e9d12c0807a (diff)
downloadchromium_src-d5471d936f1fa0be56453a92fd8917d9101ec0bd.zip
chromium_src-d5471d936f1fa0be56453a92fd8917d9101ec0bd.tar.gz
chromium_src-d5471d936f1fa0be56453a92fd8917d9101ec0bd.tar.bz2
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
Diffstat (limited to 'chrome/browser/extensions/extensions_ui.cc')
-rw-r--r--chrome/browser/extensions/extensions_ui.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index 7cc5118..55c05e0 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -597,6 +597,8 @@ DictionaryValue* ExtensionsDOMHandler::CreateExtensionDetailValue(
extension_data->SetString(L"description", extension->description());
extension_data->SetString(L"version", extension->version()->GetString());
extension_data->SetBoolean(L"enabled", enabled);
+ extension_data->SetBoolean(L"allow_reload",
+ extension->location() == Extension::LOAD);
// Determine the sort order: Extensions loaded through --load-extensions show
// up at the top. Disabled extensions show up at the bottom.