Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3900)

Unified Diff: chrome/common/plugin_group.cc

Issue 3146006: Merge 55541 - Re-enable the link to disable invididual plug-ins in a group.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/472/src/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/plugins.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/plugin_group.cc
===================================================================
--- chrome/common/plugin_group.cc (revision 55561)
+++ chrome/common/plugin_group.cc (working copy)
@@ -285,9 +285,9 @@
bool plugin_disabled_by_policy = group_disabled_by_policy ||
IsPluginNameDisabledByPolicy(web_plugin.name);
if (plugin_disabled_by_policy) {
- result->SetString(L"enabledMode", L"disabledByPolicy");
+ plugin_file->SetString(L"enabledMode", L"disabledByPolicy");
} else {
- result->SetString(L"enabledMode",
+ plugin_file->SetString(L"enabledMode",
web_plugin.enabled ? L"enabled" : L"disabledByUser");
}
plugin_file->SetInteger(L"priority", priority);
« no previous file with comments | « chrome/browser/resources/plugins.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698