Bug 440932 - toolkit dlmgr should be buildable by suite; r=ted, sr=NeilAway
This commit is contained in:
@@ -49,13 +49,12 @@
|
||||
#include "nsAlertsService.h"
|
||||
#endif
|
||||
|
||||
#ifndef MOZ_SUITE
|
||||
// XXX Suite isn't ready to include this just yet
|
||||
#ifndef SUITE_USING_XPFE_DM
|
||||
#ifdef MOZ_RDF
|
||||
#include "nsDownloadManager.h"
|
||||
#include "nsDownloadProxy.h"
|
||||
#endif
|
||||
#endif // MOZ_SUITE
|
||||
#endif
|
||||
|
||||
#include "nsTypeAheadFind.h"
|
||||
|
||||
@@ -84,14 +83,13 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsParentalControlsServiceWin)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
|
||||
#endif
|
||||
|
||||
#ifndef MOZ_SUITE
|
||||
// XXX Suite isn't ready to include this just yet
|
||||
#ifndef SUITE_USING_XPFE_DM
|
||||
#ifdef MOZ_RDF
|
||||
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsDownloadManager,
|
||||
nsDownloadManager::GetSingleton)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
|
||||
#endif
|
||||
#endif // MOZ_SUITE
|
||||
#endif
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTypeAheadFind)
|
||||
|
||||
@@ -149,8 +147,7 @@ static const nsModuleComponentInfo components[] =
|
||||
NS_PARENTALCONTROLSSERVICE_CONTRACTID,
|
||||
nsParentalControlsServiceWinConstructor },
|
||||
#endif
|
||||
#ifndef MOZ_SUITE
|
||||
// XXX Suite isn't ready to include this just yet
|
||||
#ifndef SUITE_USING_XPFE_DM
|
||||
#ifdef MOZ_RDF
|
||||
{ "Download Manager",
|
||||
NS_DOWNLOADMANAGER_CID,
|
||||
@@ -161,7 +158,7 @@ static const nsModuleComponentInfo components[] =
|
||||
NS_TRANSFER_CONTRACTID,
|
||||
nsDownloadProxyConstructor },
|
||||
#endif
|
||||
#endif // MOZ_SUITE
|
||||
#endif
|
||||
{ "TypeAheadFind Component",
|
||||
NS_TYPEAHEADFIND_CID,
|
||||
NS_TYPEAHEADFIND_CONTRACTID,
|
||||
|
||||
Reference in New Issue
Block a user