diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-10-24 06:40:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 06:40:38 +0200 |
| commit | afe69140a8485b271d8f6ac1d7551540cea11c66 (patch) | |
| tree | 578f23631e84aff1c50bb9c5c5e7999475fad607 /toolkit/components/build/nsToolkitCompsModule.cpp | |
| parent | d07a4f2ba9295068681ecfb8e36418f6b72c3d56 (diff) | |
| download | UXP-afe69140a8485b271d8f6ac1d7551540cea11c66.tar UXP-afe69140a8485b271d8f6ac1d7551540cea11c66.tar.gz UXP-afe69140a8485b271d8f6ac1d7551540cea11c66.tar.lz UXP-afe69140a8485b271d8f6ac1d7551540cea11c66.tar.xz UXP-afe69140a8485b271d8f6ac1d7551540cea11c66.zip | |
Revert "Make nsIUserInfo component optional with --disable-userinfo at build time"
Diffstat (limited to 'toolkit/components/build/nsToolkitCompsModule.cpp')
| -rw-r--r-- | toolkit/components/build/nsToolkitCompsModule.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/toolkit/components/build/nsToolkitCompsModule.cpp b/toolkit/components/build/nsToolkitCompsModule.cpp index 2b4d7c14b..190c4da06 100644 --- a/toolkit/components/build/nsToolkitCompsModule.cpp +++ b/toolkit/components/build/nsToolkitCompsModule.cpp @@ -5,9 +5,7 @@ #include "mozilla/ModuleUtils.h" #include "nsAppStartup.h" #include "nsNetCID.h" -#ifdef MOZ_USERINFO #include "nsUserInfo.h" -#endif #include "nsToolkitCompsCID.h" #include "nsFindService.h" #if defined(MOZ_UPDATER) && !defined(MOZ_WIDGET_ANDROID) @@ -78,9 +76,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPerformanceStatsService, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(nsTerminator) #endif -#if defined(MOZ_USERINFO) NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo) -#endif NS_GENERIC_FACTORY_CONSTRUCTOR(nsFindService) #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS) @@ -145,9 +141,7 @@ NS_DEFINE_NAMED_CID(NS_TOOLKIT_PERFORMANCESTATSSERVICE_CID); #if defined(MOZ_HAS_TERMINATOR) NS_DEFINE_NAMED_CID(NS_TOOLKIT_TERMINATOR_CID); #endif -#if defined(NS_USERINFO) NS_DEFINE_NAMED_CID(NS_USERINFO_CID); -#endif // defined (MOZ_USERINFO) NS_DEFINE_NAMED_CID(ALERT_NOTIFICATION_CID); NS_DEFINE_NAMED_CID(NS_ALERTSSERVICE_CID); #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS) @@ -185,9 +179,7 @@ static const Module::CIDEntry kToolkitCIDs[] = { #if defined(MOZ_HAS_PERFSTATS) { &kNS_TOOLKIT_PERFORMANCESTATSSERVICE_CID, false, nullptr, nsPerformanceStatsServiceConstructor }, #endif // defined (MOZ_HAS_PERFSTATS) -#if defined(MOZ_USERINFO) { &kNS_USERINFO_CID, false, nullptr, nsUserInfoConstructor }, -#endif // defined (MOZ_USERINFO) { &kALERT_NOTIFICATION_CID, false, nullptr, AlertNotificationConstructor }, { &kNS_ALERTSSERVICE_CID, false, nullptr, nsAlertsServiceConstructor }, #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS) @@ -227,9 +219,7 @@ static const Module::ContractIDEntry kToolkitContracts[] = { #if defined(MOZ_HAS_PERFSTATS) { NS_TOOLKIT_PERFORMANCESTATSSERVICE_CONTRACTID, &kNS_TOOLKIT_PERFORMANCESTATSSERVICE_CID }, #endif // defined (MOZ_HAS_PERFSTATS) -#if defined(NS_USERINFO) { NS_USERINFO_CONTRACTID, &kNS_USERINFO_CID }, -#endif // defined(NSUSERINFO) { ALERT_NOTIFICATION_CONTRACTID, &kALERT_NOTIFICATION_CID }, { NS_ALERTSERVICE_CONTRACTID, &kNS_ALERTSSERVICE_CID }, #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS) |