diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 20:12:36 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 20:12:36 +0000 |
| commit | a00ddf43ce3c6a012427973bd50d47a4f00eec8f (patch) | |
| tree | ff7b4400b644aab3ac25941a0e16819745956f2a | |
| parent | 8b18faaa6001e8f0819e990d940c56f8eb362508 (diff) | |
| download | chromium_src-a00ddf43ce3c6a012427973bd50d47a4f00eec8f.zip chromium_src-a00ddf43ce3c6a012427973bd50d47a4f00eec8f.tar.gz chromium_src-a00ddf43ce3c6a012427973bd50d47a4f00eec8f.tar.bz2 | |
Merge 61102 - Try to fix linux 64 compile error
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/3540003
git-svn-id: svn://svn.chromium.org/chrome/branches/517/src@61104 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/plugin_service.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index a380185..d4950f0 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -68,11 +68,10 @@ 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 + // 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. - plugin_updater::DisablePluginGroupsFromPrefs(profile); + // plugin_updater::DisablePluginGroupsFromPrefs(profile); if (CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableOutdatedPlugins)) { |