| Index: webkit/plugins/npapi/plugin_list.cc
|
| diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
|
| index ab1b9dc6d32b2c2d6d1be235cb876c0ed81ff91e..a4da48ddc96d1482c5e9463a55ae428893be324c 100644
|
| --- a/webkit/plugins/npapi/plugin_list.cc
|
| +++ b/webkit/plugins/npapi/plugin_list.cc
|
| @@ -711,13 +711,6 @@ PluginGroup* PluginList::AddToPluginGroups(
|
| }
|
| if (!group) {
|
| group = PluginGroup::FromWebPluginInfo(web_plugin_info);
|
| - // If group is scheduled for disabling do that now and remove it from the
|
| - // list.
|
| - if (groups_to_disable_.find(group->GetGroupName()) !=
|
| - groups_to_disable_.end()) {
|
| - group->EnableGroup(false);
|
| - groups_to_disable_.erase(group->GetGroupName());
|
| - }
|
| std::string identifier = group->identifier();
|
| // If the identifier is not unique, use the full path. This means that we
|
| // probably won't be able to search for this group by identifier, but at
|
| @@ -734,6 +727,13 @@ PluginGroup* PluginList::AddToPluginGroups(
|
| plugin_groups->push_back(group);
|
| }
|
| group->AddPlugin(web_plugin_info);
|
| + // If group is scheduled for disabling do that now and remove it from the
|
| + // list.
|
| + if (groups_to_disable_.find(group->GetGroupName()) !=
|
| + groups_to_disable_.end()) {
|
| + group->EnableGroup(false);
|
| + groups_to_disable_.erase(group->GetGroupName());
|
| + }
|
| return group;
|
| }
|
|
|
|
|