diff options
Diffstat (limited to 'chrome/browser/plugin_service.cc')
| -rw-r--r-- | chrome/browser/plugin_service.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index 7736a9f..6f387e4 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -68,14 +68,12 @@ void PluginService::InitGlobalInstance(Profile* profile) { NPAPI::PluginList::Singleton()->SetPluginLoadHook(LoadPluginsFromDiskHook); - // Code is disabled since plugins shouldn't be loaded on the UI/IO threads. - // See http://code.google.com/p/chromium/issues/detail?id=57425 // We first group the plugins and then figure out which groups to disable. - // PluginUpdater::GetPluginUpdater()->DisablePluginGroupsFromPrefs(profile); + PluginUpdater::GetPluginUpdater()->DisablePluginGroupsFromPrefs(profile); if (CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableOutdatedPlugins)) { - PluginUpdater::GetPluginUpdater()->DisableOutdatedPluginGroups(); + NPAPI::PluginList::Singleton()->DisableOutdatedPluginGroups(); } // Have Chrome plugins write their data to the profile directory. |