Bug #132643 --> landing the ALERTS_SERVICE_BRANCH. Turning it on for windows.

r=sspitzer
sr=hewitt
a=asa


git-svn-id: svn://10.0.0.236/trunk@117235 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/xpfe/components/build/Makefile.in

@@ -44,6 +44,7 @@ REQUIRES	= xpcom \
 		  widget \
 		  dom \
 		  downloadmanager \
+                  alerts\
       uriloader \
       webbrowserpersist \
       progressDlg \
@@ -93,11 +94,13 @@ DEFINES		+= -DWIN32_LEAN_AND_MEAN
 SHARED_LIBRARY_LIBS += \
 	$(DIST)/lib/$(LIB_PREFIX)urlwidgt_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)winhooks_s.$(LIB_SUFFIX) \
+        $(DIST)/lib/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX) \
 	$(NULL)
 OS_LIBS		+= ole32.lib shell32.lib
 LOCAL_INCLUDES	+= \
 	-I$(srcdir)/../urlwidget \
 	-I$(srcdir)/../winhooks \
+        -I$(srcdir)/../alerts/src \
 	$(NULL)
 endif
 

mozilla/xpfe/components/build/makefile.win

@@ -43,6 +43,7 @@ REQUIRES	= xpcom \
 		  content \
 		  history \
 		  search \
+                  alerts \
 		  progressDlg \
 		  related \
 		  urlbarhistory \
@@ -70,6 +71,7 @@ SUB_LIBRARIES=                           \
         $(DIST)\lib\appcompintl_s.lib    \
         $(DIST)\lib\related_s.lib        \
         $(DIST)\lib\search_s.lib         \
+        $(DIST)\lib\alerts_s.lib         \
         $(DIST)\lib\timebomb_s.lib       \
         $(DIST)\lib\urlbarhistory_s.lib  \
         $(DIST)\lib\urlwidgt_s.lib       \
@@ -100,6 +102,7 @@ INCS = $(INCS)                                       \
         -I$(DEPTH)\xpfe\components\urlbarhistory\src \
         -I$(DEPTH)\xpfe\components\urlwidget         \
         -I$(DEPTH)\xpfe\components\winhooks          \
+        -I$(DEPTH)\xpfe\components\alerts\src        \
         $(NULL)
 
 include <$(DEPTH)\config\rules.mak>

mozilla/xpfe/components/build/nsModule.cpp

@@ -52,6 +52,7 @@
 #include "nsCharsetMenu.h"
 #include "nsFontPackageHandler.h"
 #if defined(XP_WIN)
+#include "nsAlertsService.h" 
 #include "nsUrlWidget.h"
 #include "nsWindowsHooks.h"
 #endif // Windows
@@ -75,6 +76,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimeBomb)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlbarHistory)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontPackageHandler)
 #if defined(XP_WIN)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUrlWidget, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsHooks)
 #endif // Windows
@@ -171,7 +173,7 @@ static const nsModuleComponentInfo components[] = {
       NS_INTERNETSEARCH_DATASOURCE_CONTRACTID, InternetSearchDataSourceConstructor },
     { "Related Links Handler", NS_RELATEDLINKSHANDLER_CID, NS_RELATEDLINKSHANDLER_CONTRACTID,
 	  RelatedLinksHandlerImplConstructor},
-	{ "Netscape TimeBomb", NS_TIMEBOMB_CID, NS_TIMEBOMB_CONTRACTID, nsTimeBombConstructor},
+    { "Netscape TimeBomb", NS_TIMEBOMB_CID, NS_TIMEBOMB_CONTRACTID, nsTimeBombConstructor},
     { "nsUrlbarHistory", NS_URLBARHISTORY_CID,
       NS_URLBARHISTORY_CONTRACTID, nsUrlbarHistoryConstructor },
     { "nsUrlbarHistory", NS_URLBARHISTORY_CID,
@@ -185,6 +187,7 @@ static const nsModuleComponentInfo components[] = {
 #if defined(XP_WIN)
     { NS_IURLWIDGET_CLASSNAME, NS_IURLWIDGET_CID, NS_IURLWIDGET_CONTRACTID,
       nsUrlWidgetConstructor },
+    { "nsAlertsService", NS_ALERTSSERVICE_CID, NS_ALERTSERVICE_CONTRACTID, nsAlertsServiceConstructor},
     { NS_IWINDOWSHOOKS_CLASSNAME, NS_IWINDOWSHOOKS_CID, NS_IWINDOWSHOOKS_CONTRACTID,
       nsWindowsHooksConstructor },
 #endif // Windows