Remaining Fixes for #68720 - EmbedAPI should use generic startup observers

r=ccarlen,sr=alecf

embedding/components/Makefile.in

@@ -24,6 +24,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = windowwatcher build
+DIRS = windowwatcher appstartup build
 
 include $(topsrcdir)/config/rules.mk

embedding/components/build/Makefile.in

@@ -27,7 +27,7 @@ MODULE		= embedcomponents
 LIBRARY_NAME	= embedcomponents
 SHORT_LIBNAME	= embedcmp
 IS_COMPONENT	= 1
-REQUIRES	= js xpcom string windowwatcher embed_base
+REQUIRES	= js xpcom string windowwatcher appstartupnotifier embed_base
 
 CPPSRCS		= nsModule.cpp
 
@@ -42,6 +42,7 @@ else
 
 SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/libwindowwatcher_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/libappstartupnotifier_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifdef MOZ_PERF_METRICS
@@ -52,6 +53,7 @@ endif
 
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../windowwatcher/src  \
+	-I$(srcdir)/../appstartup/src  \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS = \

embedding/components/build/makefile.win

@@ -36,10 +36,12 @@ LLIBS = \
         $(DIST)\lib\js3250.lib \
 	$(DIST)\lib\xpcom.lib \
 	$(DIST)\lib\windowwatcher_s.lib \
+	$(DIST)\lib\appstartupnotifier_s.lib \
 	$(NULL)
 
 INCS = $(INCS) \
 	-I$(DEPTH)\embedding\components\windowwatcher\src \
+	-I$(DEPTH)\embedding\components\appstartup\src \
 	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>

embedding/components/build/nsModule.cpp

@@ -22,13 +22,15 @@
 
 #include "nsIGenericFactory.h"
 #include "nsWindowWatcher.h"
+#include "nsAppStartupNotifier.h"
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowWatcher, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppStartupNotifier)
 
 static nsModuleComponentInfo components[] = {
 
-  { "Window Watcher", NS_WINDOWWATCHER_CID, NS_WINDOWWATCHER_CONTRACTID, nsWindowWatcherConstructor }
+  { "Window Watcher", NS_WINDOWWATCHER_CID, NS_WINDOWWATCHER_CONTRACTID, nsWindowWatcherConstructor },
+  { NS_APPSTARTUPNOTIFIER_CLASSNAME, NS_APPSTARTUPNOTIFIER_CID, NS_APPSTARTUPNOTIFIER_CONTRACTID, nsAppStartupNotifierConstructor }
 };
 
-NS_IMPL_NSGETMODULE("windowwatcher", components)
-
+NS_IMPL_NSGETMODULE("embedcomponents", components)

embedding/components/makefile.win

@@ -22,6 +22,7 @@ DEPTH=..\..
 
 DIRS= \
 	windowwatcher \
+	appstartup \
 	build \
 	$(NULL)