Bug 330053 Make SeaMonkey capable of generating a reasonable build with MOZ_XUL_APP set. Part 5 - First stab at sorting out inclusion of modules in xpfe and toolkit. r=benjamin,sr=Neil

git-svn-id: svn://10.0.0.236/trunk@194399 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugzilla%standard8.demon.co.uk
2006-04-14 07:04:53 +00:00
parent 1b27bdb054
commit 4121dfd424
8 changed files with 60 additions and 4 deletions

View File

@@ -44,12 +44,15 @@
#include "nsAlertsService.h"
#endif
#ifndef MOZ_SUITE
// XXX Suite isn't ready to include this just yet
#ifdef MOZ_XPINSTALL
#include "nsDownloadManager.h"
#include "nsDownloadProxy.h"
#endif
#include "nsTypeAheadFind.h"
#endif // MOZ_SUITE
/////////////////////////////////////////////////////////////////////////////
@@ -60,12 +63,15 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
#endif
#ifndef MOZ_SUITE
// XXX Suite isn't ready to include this just yet
#ifdef MOZ_XPINSTALL
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
#endif
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTypeAheadFind)
#endif // MOZ_SUITE
/////////////////////////////////////////////////////////////////////////////
@@ -86,6 +92,8 @@ static const nsModuleComponentInfo components[] =
NS_ALERTSERVICE_CONTRACTID,
nsAlertsServiceConstructor },
#endif
#ifndef MOZ_SUITE
// XXX Suite isn't ready to include this just yet
#ifdef MOZ_XPINSTALL
{ "Download Manager",
NS_DOWNLOADMANAGER_CID,
@@ -101,6 +109,7 @@ static const nsModuleComponentInfo components[] =
NS_TYPEAHEADFIND_CONTRACTID,
nsTypeAheadFindConstructor
},
#endif // MOZ_SUITE
};
NS_IMPL_NSGETMODULE(nsToolkitCompsModule, components)