diff --git a/mozilla/netwerk/build/nsNetModule.cpp b/mozilla/netwerk/build/nsNetModule.cpp index c2d36d7b560..58616f4d89b 100644 --- a/mozilla/netwerk/build/nsNetModule.cpp +++ b/mozilla/netwerk/build/nsNetModule.cpp @@ -168,9 +168,7 @@ UnregisterBasicAuth(nsIComponentManager *aCompMgr, nsIFile *aPath, #include "nsAboutBlank.h" #include "nsAboutBloat.h" #include "nsAboutCache.h" -#include "nsAboutCredits.h" -#include "nsAboutPlugins.h" -#include "mzAboutMozilla.h" +#include "nsAboutRedirector.h" #include "nsKeywordProtocolHandler.h" #ifdef MOZ_NEW_CACHE @@ -841,19 +839,19 @@ static nsModuleComponentInfo gNetModuleInfo[] = { nsAboutBloat::Create }, { "about:credits", - NS_ABOUT_CREDITS_MODULE_CID, + NS_ABOUT_REDIRECTOR_MODULE_CID, NS_ABOUT_MODULE_CONTRACTID_PREFIX "credits", - nsAboutCredits::Create + nsAboutRedirector::Create }, { "about:plugins", - NS_ABOUT_PLUGINS_MODULE_CID, + NS_ABOUT_REDIRECTOR_MODULE_CID, NS_ABOUT_MODULE_CONTRACTID_PREFIX "plugins", - nsAboutPlugins::Create + nsAboutRedirector::Create }, { "about:mozilla", - MZ_ABOUT_MOZILLA_MODULE_CID, + NS_ABOUT_REDIRECTOR_MODULE_CID, NS_ABOUT_MODULE_CONTRACTID_PREFIX "mozilla", - mzAboutMozilla::Create + nsAboutRedirector::Create }, { "about:cache", NS_ABOUT_CACHE_MODULE_CID, diff --git a/mozilla/netwerk/protocol/about/src/Makefile.in b/mozilla/netwerk/protocol/about/src/Makefile.in index 2045586cb4f..4228511b749 100644 --- a/mozilla/netwerk/protocol/about/src/Makefile.in +++ b/mozilla/netwerk/protocol/about/src/Makefile.in @@ -35,9 +35,7 @@ CPPSRCS = \ nsAboutBlank.cpp \ nsAboutBloat.cpp \ nsAboutCache.cpp \ - nsAboutCredits.cpp \ - nsAboutPlugins.cpp \ - mzAboutMozilla.cpp \ + nsAboutRedirector.cpp \ $(NULL) ifdef MOZ_NEW_CACHE diff --git a/mozilla/netwerk/protocol/about/src/makefile.win b/mozilla/netwerk/protocol/about/src/makefile.win index 4e30d887b0b..9d5653dfd42 100644 --- a/mozilla/netwerk/protocol/about/src/makefile.win +++ b/mozilla/netwerk/protocol/about/src/makefile.win @@ -32,9 +32,7 @@ CPP_OBJS= \ .\$(OBJDIR)\nsAboutProtocolHandler.obj \ .\$(OBJDIR)\nsAboutBlank.obj \ .\$(OBJDIR)\nsAboutBloat.obj \ - .\$(OBJDIR)\nsAboutCredits.obj \ - .\$(OBJDIR)\mzAboutMozilla.obj \ - .\$(OBJDIR)\nsAboutPlugins.obj \ + .\$(OBJDIR)\nsAboutRedirector.obj \ .\$(OBJDIR)\nsAboutCache.obj \ !ifdef MOZ_NEW_CACHE .\$(OBJDIR)\nsAboutCacheEntry.obj \