summaryrefslogtreecommitdiffstats
path: root/chrome/common/plugin_group.cc
diff options
context:
space:
mode:
authordanno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 13:55:18 +0000
committerdanno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 13:55:18 +0000
commit492d214950b16d229ced62021486e9e0ec859e40 (patch)
treeac098e0dc234b894433b13d409ddb198cd9d24b1 /chrome/common/plugin_group.cc
parent0ef5163fe4f9a76f516f09f7aa9d19c322e79691 (diff)
downloadchromium_src-492d214950b16d229ced62021486e9e0ec859e40.zip
chromium_src-492d214950b16d229ced62021486e9e0ec859e40.tar.gz
chromium_src-492d214950b16d229ced62021486e9e0ec859e40.tar.bz2
Policy: plugins disabled by policy should honor policy changes without Chrome relaunch.
BUG=54620 TEST=PrefChangeRegistrarTest.* Review URL: http://codereview.chromium.org/3316007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/plugin_group.cc')
-rw-r--r--chrome/common/plugin_group.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/common/plugin_group.cc b/chrome/common/plugin_group.cc
index 2061956..f426803 100644
--- a/chrome/common/plugin_group.cc
+++ b/chrome/common/plugin_group.cc
@@ -88,6 +88,8 @@ size_t PluginGroup::GetPluginGroupDefinitionsSize() {
void PluginGroup::SetPolicyDisabledPluginSet(const std::set<string16>& set) {
if (!policy_disabled_plugins_)
policy_disabled_plugins_ = new std::set<string16>(set);
+ else
+ *policy_disabled_plugins_ = set;
}
/*static*/