Bug 1492095 - Replace the XPCOM component registration for nsAppStartupNotifier removed in bug 1491741. rs=bustage-fix DONTBUILD

common/public/nsCommonBaseCID.h

@@ -22,4 +22,8 @@
 #define NS_TRANSACTIONMANAGER_CID \
   { 0x9c8f9601, 0x801a, 0x11d2, { 0x98, 0xba, 0x0, 0x80, 0x5f, 0x29, 0x7d, 0x89 } }
 
+#define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1"
+#define NS_APPSTARTUPNOTIFIER_CID \
+   { 0x1f59b001, 0x2c9, 0x11d5, { 0xae, 0x76, 0xcc, 0x92, 0xf7, 0xdb, 0x9e, 0x3 } }
+
 #endif // nsCommonBaseCID_h__

common/src/moz.build

@@ -13,5 +13,7 @@ SOURCES += [
     'nsCommonModule.cpp',
     'nsComponentManagerExtra.cpp',
 ]
-
+LOCAL_INCLUDES += [
+    '/%s/toolkit/xre' % CONFIG['mozreltopsrcdir'],
+]
 FINAL_LIBRARY = 'xul'

common/src/nsCommonModule.cpp

@@ -4,6 +4,7 @@
 
 #include "mozilla/ModuleUtils.h"
 #include "mozilla/TransactionManager.h"
+#include "nsAppStartupNotifier.h"
 #include "nsBaseCommandController.h"
 #include "nsCommonBaseCID.h"
 #include "nsComponentManagerExtra.h"
@@ -19,10 +20,14 @@ NS_DEFINE_NAMED_CID(NS_BASECOMMANDCONTROLLER_CID);
 NS_GENERIC_FACTORY_CONSTRUCTOR(TransactionManager)
 NS_DEFINE_NAMED_CID(NS_TRANSACTIONMANAGER_CID);
 
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppStartupNotifier)
+NS_DEFINE_NAMED_CID(NS_APPSTARTUPNOTIFIER_CID);
+
 const mozilla::Module::CIDEntry kCommonCIDs[] = {
   { &kNS_COMPONENTMANAGEREXTRA_CID, false, nullptr, nsComponentManagerExtraConstructor },
   { &kNS_BASECOMMANDCONTROLLER_CID, false, nullptr, nsBaseCommandControllerConstructor },
   { &kNS_TRANSACTIONMANAGER_CID, false, nullptr, TransactionManagerConstructor },
+  { &kNS_APPSTARTUPNOTIFIER_CID, false, nullptr, nsAppStartupNotifierConstructor },
   { nullptr }
 };
 
@@ -30,6 +35,7 @@ const mozilla::Module::ContractIDEntry kCommonContracts[] = {
   { NS_COMPONENTMANAGEREXTRA_CONTRACTID, &kNS_COMPONENTMANAGEREXTRA_CID },
   { NS_BASECOMMANDCONTROLLER_CONTRACTID, &kNS_BASECOMMANDCONTROLLER_CID },
   { NS_TRANSACTIONMANAGER_CONTRACTID, &kNS_TRANSACTIONMANAGER_CID },
+  { NS_APPSTARTUPNOTIFIER_CONTRACTID, &kNS_APPSTARTUPNOTIFIER_CID },
   { nullptr }
 };