diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 08:30:21 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 08:30:21 +0000 |
| commit | 901f06f5e4f1354811d25438ad5f069050db9cbe (patch) | |
| tree | f02411e17cd10e408db584bc876a8237d53cd667 | |
| parent | 64ec3d13abf89f523f5d834a3dddb76e115bdf88 (diff) | |
| download | chromium_src-901f06f5e4f1354811d25438ad5f069050db9cbe.zip chromium_src-901f06f5e4f1354811d25438ad5f069050db9cbe.tar.gz chromium_src-901f06f5e4f1354811d25438ad5f069050db9cbe.tar.bz2 | |
Re-enable the link to disable invididual plug-ins in a group.
BUG=51597
TEST=In about:plugins, click on "Details". There should be a link to enable/disable each individual plug-in in a plug-in group.
Review URL: http://codereview.chromium.org/3038055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55541 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/plugins.html | 37 | ||||
| -rw-r--r-- | chrome/common/plugin_group.cc | 4 |
2 files changed, 20 insertions, 21 deletions
diff --git a/chrome/browser/resources/plugins.html b/chrome/browser/resources/plugins.html index dbaf7555..fa3d893 100644 --- a/chrome/browser/resources/plugins.html +++ b/chrome/browser/resources/plugins.html @@ -579,28 +579,27 @@ document.addEventListener('DOMContentLoaded', requestPluginsData); <td> <span jsdisplay="enabledMode == 'disabledByUser'" i18n-content="pluginDisabled">(DISABLED)</span> - <span> <span jsdisplay="enabledMode == 'disabledByPolicy'" i18n-content="pluginDisabled">(DISABLED_BY_POLICY)</span> <span> - <a - jsvalues=".path:name" - jsdisplay="enabledMode == 'enabled'" - onclick="handleEnablePlugin(this, false, false)" - href="javascript:void(0);" - i18n-content="disable" - >DISABLE</a> - <a - jsvalues=".path:name" - jsdisplay="enabledMode == 'disabledByUser'" - onclick="handleEnablePlugin(this, true, false)" - href="javascript:void(0);" - i18n-content="enable" - >ENABLE</a> - <span - jsdisplay="enabledMode == 'disabledByPolicy'" - i18n-content="pluginCannotBeEnabledDueToPolicy" - >CANNOT_ENABLE</span> + <a + jsvalues=".path:path" + jsdisplay="enabledMode == 'enabled'" + onclick="handleEnablePlugin(this, false, false)" + href="javascript:void(0);" + i18n-content="disable" + >DISABLE</a> + <a + jsvalues=".path:path" + jsdisplay="enabledMode == 'disabledByUser'" + onclick="handleEnablePlugin(this, true, false)" + href="javascript:void(0);" + i18n-content="enable" + >ENABLE</a> + <span + jsdisplay="enabledMode == 'disabledByPolicy'" + i18n-content="pluginCannotBeEnabledDueToPolicy" + >CANNOT_ENABLE</span> </span> </td> </tr></table></div> diff --git a/chrome/common/plugin_group.cc b/chrome/common/plugin_group.cc index 8e2368d..19d2912 100644 --- a/chrome/common/plugin_group.cc +++ b/chrome/common/plugin_group.cc @@ -287,9 +287,9 @@ DictionaryValue* PluginGroup::GetDataForUI() const { bool plugin_disabled_by_policy = group_disabled_by_policy || IsPluginNameDisabledByPolicy(web_plugin.name); if (plugin_disabled_by_policy) { - result->SetString("enabledMode", "disabledByPolicy"); + plugin_file->SetString("enabledMode", "disabledByPolicy"); } else { - result->SetString("enabledMode", + plugin_file->SetString("enabledMode", web_plugin.enabled ? "enabled" : "disabledByUser"); } plugin_file->SetInteger("priority", priority); |