When java is disabled in preferences, the plugin host shouldn't claim it's

supported. Bug 310021, r=biesi, sr=jst git-svn-id: svn://10.0.0.236/trunk@184213 18797224-902f-48f8-a5cc-f745e15eee43
2005-11-06 18:34:03 +00:00
parent 295d57702d
commit 56fc0d4534
3 changed files with 284 additions and 197 deletions
--- a/mozilla/modules/plugin/base/src/nsPluginModule.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginModule.cpp
@@ -42,16 +42,19 @@
 #include "nsPluginHostImpl.h"
 #include "ns4xPlugin.h"

+NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsPluginHostImpl,
+                                         nsPluginHostImpl::GetInst)
+
 static const nsModuleComponentInfo gComponentInfo[] = {
  { "Plugin Host",
    NS_PLUGIN_HOST_CID,
    "@mozilla.org/plugin/host;1",
-    nsPluginHostImpl::Create },
+    nsPluginHostImplConstructor },

  { "Plugin Manager",
    NS_PLUGINMANAGER_CID,
    "@mozilla.org/plugin/manager;1",
-    nsPluginHostImpl::Create },
+    nsPluginHostImplConstructor },
 };

 NS_IMPL_NSGETMODULE(nsPluginModule, gComponentInfo)