Bug 462438 - kill MOZ_PROFILESHARING and MOZ_IPCD; embedding cleanup, v2; r+sr=benjamin
authorArpad Borsos <arpad.borsos@googlemail.com>
Thu, 04 Dec 2008 15:26:09 +0100
changeset 22323 dad669d8d557443fc34f6d2df034bad8f30ec666
parent 22322 2f6c27da8df307523d39342694a27a255af0098b
child 22324 e6091173285a0bf3fccc275e6532226de98c0e3e
push idunknown
push userunknown
push dateunknown
bugs462438
milestone1.9.2a1pre
Bug 462438 - kill MOZ_PROFILESHARING and MOZ_IPCD; embedding cleanup, v2; r+sr=benjamin
embedding/components/build/nsEmbeddingModule.cpp
--- a/embedding/components/build/nsEmbeddingModule.cpp
+++ b/embedding/components/build/nsEmbeddingModule.cpp
@@ -123,21 +123,16 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDialogP
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPromptService, Init)
 #ifdef NS_PRINTING
 #ifndef WINCE
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintingPromptService, Init)
 #endif
 #endif
 #endif
 
-#ifdef MOZ_PROFILESHARING
-#include "nsProfileSharingSetup.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileSharingSetup)
-#endif
-
 static const nsModuleComponentInfo gComponents[] = {
 
 #ifdef MOZ_XUL
   { "Dialog ParamBlock", NS_DIALOGPARAMBLOCK_CID, NS_DIALOGPARAMBLOCK_CONTRACTID, nsDialogParamBlockConstructor },
   { "Prompt Service", NS_PROMPTSERVICE_CID, NS_PROMPTSERVICE_CONTRACTID, nsPromptServiceConstructor },
   { "Nonblocking Alert Service", NS_PROMPTSERVICE_CID, NS_NONBLOCKINGALERTSERVICE_CONTRACTID, nsPromptServiceConstructor },
 #ifdef NS_PRINTING
 #ifndef WINCE
@@ -153,14 +148,11 @@ static const nsModuleComponentInfo gComp
   { "WebBrowserPersist Component", NS_WEBBROWSERPERSIST_CID, NS_WEBBROWSERPERSIST_CONTRACTID, nsWebBrowserPersistConstructor },
   { "Controller Command Table", NS_CONTROLLERCOMMANDTABLE_CID, NS_CONTROLLERCOMMANDTABLE_CONTRACTID, nsControllerCommandTableConstructor },
   { "Command Manager", NS_COMMAND_MANAGER_CID, NS_COMMAND_MANAGER_CONTRACTID, nsCommandManagerConstructor },
   { "Command Params", NS_COMMAND_PARAMS_CID, NS_COMMAND_PARAMS_CONTRACTID, nsCommandParamsConstructor },
   { "Command Group", NS_CONTROLLER_COMMAND_GROUP_CID, NS_CONTROLLER_COMMAND_GROUP_CONTRACTID, nsControllerCommandGroupConstructor },
   { "Base Command Controller", NS_BASECOMMANDCONTROLLER_CID, NS_BASECOMMANDCONTROLLER_CONTRACTID, nsBaseCommandControllerConstructor },
   { NS_DEFAULTPROMPT_CLASSNAME, NS_DEFAULTPROMPT_CID, NS_DEFAULTPROMPT_CONTRACTID, nsDefaultPromptConstructor },
   { NS_DEFAULTAUTHPROMPT_CLASSNAME, NS_DEFAULTAUTHPROMPT_CID, NS_DEFAULTAUTHPROMPT_CONTRACTID, nsDefaultAuthPromptConstructor }
-#ifdef MOZ_PROFILESHARING
-  ,{ "Profile Sharing Setup", NS_PROFILESHARINGSETUP_CID, NS_PROFILESHARINGSETUP_CONTRACTID, nsProfileSharingSetupConstructor }
-#endif
 };
 
 NS_IMPL_NSGETMODULE(embedcomponents, gComponents)