diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 23:17:41 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 23:17:41 +0000 |
| commit | 61b41161d9aaeb5b4e9568270097981edcf47a72 (patch) | |
| tree | dbfd00c74eb0ee14e701190d8c5eabffd7f6a678 /chrome/browser/resources | |
| parent | b93301b9c8fef8c64ba33a5f47554dad97a6b3e3 (diff) | |
| download | chromium_src-61b41161d9aaeb5b4e9568270097981edcf47a72.zip chromium_src-61b41161d9aaeb5b4e9568270097981edcf47a72.tar.gz chromium_src-61b41161d9aaeb5b4e9568270097981edcf47a72.tar.bz2 | |
Disabled extensions should be uninstallable.
The code to display the dialog looks up an
Extension by id but doesn't return disabled ones.
So I added that option to the function.
I also added a check so that we don't show the
Options button enabled when the extension is
disabled, since you need the extension to be
enabled for the Options page to work.
BUG=26910
TEST=Disable an extension that has an Option page,
make sure Options is not enabled after disabling,
then uninstall it. It should uninstall.
Review URL: http://codereview.chromium.org/385014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
| -rw-r--r-- | chrome/browser/resources/extensions_ui.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/resources/extensions_ui.html b/chrome/browser/resources/extensions_ui.html index cc7d95d..8acb98b 100644 --- a/chrome/browser/resources/extensions_ui.html +++ b/chrome/browser/resources/extensions_ui.html @@ -731,13 +731,14 @@ function autoUpdate() { </td> <td align="right" valign="center" width="90"> <button - jsdisplay="options_url" + jsdisplay="options_url && enabled" jsvalues=".extensionId:id" onclick="handleOptions(this)" i18n-content="options" >OPTIONS</button> <button - jsdisplay="typeof(options_url) == 'undefined' || + jsdisplay="!enabled || + typeof(options_url) == 'undefined' || options_url.length == 0" disabled="true" i18n-content="options" |