summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_service.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-30 20:10:05 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-30 20:10:05 +0000
commit3a3adbc08dacf3da67155a34e4a59c33dc36fa74 (patch)
treef6b4d63e71fd1238f384cc2ceae7f01566548425 /chrome/browser/plugin_service.cc
parentcbbf3c69004e3264f3c284a337b57c09dfada25d (diff)
downloadchromium_src-3a3adbc08dacf3da67155a34e4a59c33dc36fa74.zip
chromium_src-3a3adbc08dacf3da67155a34e4a59c33dc36fa74.tar.gz
chromium_src-3a3adbc08dacf3da67155a34e4a59c33dc36fa74.tar.bz2
Try to fix linux 64 compile error
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_service.cc')
-rw-r--r--chrome/browser/plugin_service.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc
index bfbc3fe..7736a9f 100644
--- a/chrome/browser/plugin_service.cc
+++ b/chrome/browser/plugin_service.cc
@@ -68,12 +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.
- PluginUpdater::GetPluginUpdater()->DisablePluginGroupsFromPrefs(profile);
- */
+ // PluginUpdater::GetPluginUpdater()->DisablePluginGroupsFromPrefs(profile);
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableOutdatedPlugins)) {