Issue %3005 - Follow-up: Give Directory Viewer its own factory

- This frees up the xpfe factory if I need it in binoc-central

3 files changed, 12 insertions, 10 deletions

diff --git a/components/build/moz.build b/components/build/moz.build
index 8bb583078..6f6053be2 100644
--- a/components/build/moz.build
+++ b/components/build/moz.build
@@ -11,7 +11,6 @@ EXPORTS += [
 SOURCES += [
   'nsRDFModule.cpp',
   'nsToolkitCompsModule.cpp',
-  'nsXPFEFactory.cpp'
 ]
 
 LOCAL_INCLUDES += [
diff --git a/components/directory/moz.build b/components/directory/moz.build
index e5007fca6..ea3cf921e 100644
--- a/components/directory/moz.build
+++ b/components/directory/moz.build
@@ -5,7 +5,10 @@
 
 XPIDL_SOURCES += ['public/nsIHTTPIndex.idl']
 
-SOURCES += ['src/nsDirectoryViewer.cpp']
+SOURCES += [
+  'src/nsDirectoryViewer.cpp',
+  'src/nsDirectoryViewerFactory.cpp',
+]
 
 if CONFIG['GNU_CXX']:
   CXXFLAGS += ['-Wno-error=shadow']
diff --git a/components/build/nsXPFEFactory.cpp b/components/directory/src/nsDirectoryViewerFactory.cpp
index 43966f94d..e7f4d2eae 100644
--- a/components/build/nsXPFEFactory.cpp
+++ b/components/directory/src/nsDirectoryViewerFactory.cpp
@@ -16,29 +16,29 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDirectoryViewerFactory)
 NS_DEFINE_NAMED_CID(NS_DIRECTORYVIEWERFACTORY_CID);
 NS_DEFINE_NAMED_CID(NS_HTTPINDEX_SERVICE_CID);
 
-static const mozilla::Module::CIDEntry kXPFECIDs[] = {
+static const mozilla::Module::CIDEntry kDirectoryViewerCIDs[] = {
     { &kNS_DIRECTORYVIEWERFACTORY_CID, false, nullptr, nsDirectoryViewerFactoryConstructor },
     { &kNS_HTTPINDEX_SERVICE_CID, false, nullptr, nsHTTPIndexConstructor },
     { nullptr }
 };
 
-static const mozilla::Module::ContractIDEntry kXPFEContracts[] = {
+static const mozilla::Module::ContractIDEntry kDirectoryViewerContracts[] = {
     { "@mozilla.org/xpfe/http-index-format-factory-constructor", &kNS_DIRECTORYVIEWERFACTORY_CID },
     { NS_HTTPINDEX_SERVICE_CONTRACTID, &kNS_HTTPINDEX_SERVICE_CID },
     { NS_HTTPINDEX_DATASOURCE_CONTRACTID, &kNS_HTTPINDEX_SERVICE_CID },
     { nullptr }
 };
 
-static const mozilla::Module::CategoryEntry kXPFECategories[] = {
+static const mozilla::Module::CategoryEntry kDirectoryViewerCategories[] = {
     { "Gecko-Content-Viewers", "application/http-index-format", "@mozilla.org/xpfe/http-index-format-factory-constructor" },
     { nullptr }
 };
 
-static const mozilla::Module kXPFEModule = {
+static const mozilla::Module kDirectoryViewerModule = {
     mozilla::Module::kVersion,
-    kXPFECIDs,
-    kXPFEContracts,
-    kXPFECategories
+    kDirectoryViewerCIDs,
+    kDirectoryViewerContracts,
+    kDirectoryViewerCategories
 };
 
-NSMODULE_DEFN(application) = &kXPFEModule;
+NSMODULE_DEFN(application) = &kDirectoryViewerModule;