bug 380786 - clean up xpfe/ after suite moving to toolkit, step 1, r=Standard8 r=luser sr=Neil
--- a/xpfe/Makefile.in
+++ b/xpfe/Makefile.in
@@ -50,23 +50,18 @@ ifndef MOZ_SUNBIRD
DIRS += browser
endif
ifdef MOZ_THUNDERBIRD
DIRS += communicator
endif
ifndef MOZ_XUL_APP
-DIRS += global
-
-# XXX Clean this up once SeaMonkey becomes a full xul app
-ifndef MOZ_SUITE
-DIRS += communicator
+DIRS += global communicator
endif
-endif # MOZ_XUL_APP
# Because of our great use of encapsulation, there are
# some header file in xpfe/components that are required
# by layout and the dom. This MOZ_XPFE_COMPONENTS, if
# unset, allows us to only export - not build - this
# stuff.
ifdef MOZ_XPFE_COMPONENTS
DIRS += components
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -47,23 +47,16 @@ LIBRARY_NAME = appcomps
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = application
LIBXUL_LIBRARY = 1
PACKAGE_FILE = appcomps.pkg
PACKAGE_VARS += MOZ_PHOENIX
-ifndef MOZ_XUL_APP
-ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2))
-ALERTS_SERVICE=1
-DEFINES += -DALERTS_SERVICE
-endif
-endif
-
REQUIRES = xpcom \
string \
content \
rdf \
necko \
nkcache \
intl \
locale \
@@ -96,21 +89,16 @@ SHARED_LIBRARY_LIBS += ../directory/$(LI
LOCAL_INCLUDES += -I$(srcdir)/../directory
# Non-Mac Browser requirements
ifneq ($(MOZ_BUILD_APP),macbrowser)
SHARED_LIBRARY_LIBS += ../../browser/src/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX)
LOCAL_INCLUDES += -I$(srcdir)/../../browser/src
endif
-ifdef ALERTS_SERVICE
-SHARED_LIBRARY_LIBS += ../alerts/src/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
-LOCAL_INCLUDES += -I$(srcdir)/../alerts/src
-endif # ALERTS_SERVICE
-
# Suite specific includes
ifdef MOZ_SUITE
REQUIRES += history downloadmanager
SHARED_LIBRARY_LIBS += \
../download-manager/src/$(LIB_PREFIX)downloadmanager_s.$(LIB_SUFFIX) \
../history/src/$(LIB_PREFIX)history_s.$(LIB_SUFFIX) \
../related/src/$(LIB_PREFIX)related_s.$(LIB_SUFFIX) \
@@ -127,28 +115,16 @@ SHARED_LIBRARY_LIBS += \
../winhooks/$(LIB_PREFIX)winhooks_s.$(LIB_SUFFIX) \
$(NULL)
LOCAL_INCLUDES += \
-I$(srcdir)/../urlwidget \
-I$(srcdir)/../winhooks \
$(NULL)
endif # WINNT
-# XXX When Suite becomes a full XUL App this section can be removed.
-ifndef MOZ_XUL_APP
-SHARED_LIBRARY_LIBS += ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX)
-LOCAL_INCLUDES += -I$(srcdir)/../startup/src
-
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-SHARED_LIBRARY_LIBS += ../../bootstrap/appleevents/$(LIB_PREFIX)appleevents_s.$(LIB_SUFFIX)
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
-endif # MOZ_XUL_APP
-
endif # MOZ_SUITE
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
endif
EXTRA_DSO_LDOPTS += \
$(MOZ_UNICHARUTIL_LIBS) \
--- a/xpfe/components/build/nsModule.cpp
+++ b/xpfe/components/build/nsModule.cpp
@@ -47,34 +47,23 @@
#ifdef MOZ_SUITE
#include "nsRelatedLinksHandlerImpl.h"
#include "nsGlobalHistory.h"
#include "nsDocShellCID.h"
#include "nsDownloadManager.h"
#include "nsDownloadProxy.h"
-// XXX When Suite becomes a full XUL App this section can be removed.
-#ifndef MOZ_XUL_APP
-#include "nsAppStartup.h"
-#include "nsCommandLineService.h"
-#include "nsUserInfo.h"
-#endif // !MOZ_XUL_APP
-
#if defined(XP_WIN)
#include "nsWindowsHooks.h"
#include "nsUrlWidget.h"
#endif // Windows
#endif // MOZ_SUITE
-#ifdef ALERTS_SERVICE
-#include "nsAlertsService.h"
-#endif
-
#if !defined(MOZ_MACBROWSER)
#include "nsBrowserStatusFilter.h"
#include "nsBrowserInstance.h"
#endif
#include "nsCURILoader.h"
#include "nsXPFEComponentsCID.h"
// {9491C382-E3C4-11D2-BDBE-0050040A9B44}
@@ -96,33 +85,23 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowser
#endif
#ifdef MOZ_SUITE
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(RelatedLinksHandlerImpl, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
-#ifndef MOZ_XUL_APP
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsCmdLineService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppStartup)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo)
-#endif // !MOZ_XUL_APP
-
#if defined(XP_WIN)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsHooks)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUrlWidget, Init)
#endif // Windows
#endif // MOZ_SUITE
-#ifdef ALERTS_SERVICE
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
-#endif
-
#if (!defined(MOZ_XUL_APP)) && !defined(MOZ_MACBROWSER)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserContentHandler)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsChromeStartupHandler)
#endif
static NS_METHOD
RegisterProc(nsIComponentManager *aCompMgr,
@@ -176,33 +155,16 @@ static const nsModuleComponentInfo compo
{ "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY2_CONTRACTID,
nsGlobalHistoryConstructor },
{ "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_DATASOURCE_CONTRACTID,
nsGlobalHistoryConstructor },
{ "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_AUTOCOMPLETE_CONTRACTID,
nsGlobalHistoryConstructor },
{ "Related Links Handler", NS_RELATEDLINKSHANDLER_CID, NS_RELATEDLINKSHANDLER_CONTRACTID,
RelatedLinksHandlerImplConstructor},
-#ifndef MOZ_XUL_APP
- { "App Startup Service",
- NS_SEAMONKEY_APPSTARTUP_CID,
- NS_APPSTARTUP_CONTRACTID,
- nsAppStartupConstructor
- },
- { "CommandLine Service",
- NS_COMMANDLINESERVICE_CID,
- NS_COMMANDLINESERVICE_CONTRACTID,
- nsCmdLineServiceConstructor
- },
- { "User Info Service",
- NS_USERINFO_CID,
- NS_USERINFO_CONTRACTID,
- nsUserInfoConstructor
- },
-#endif // MOZ_XUL_APP
#ifdef XP_WIN
{ NS_IURLWIDGET_CLASSNAME, NS_IURLWIDGET_CID,
NS_IURLWIDGET_CONTRACTID, nsUrlWidgetConstructor },
{ NS_IWINDOWSHOOKS_CLASSNAME, NS_IWINDOWSHOOKS_CID,
NS_IWINDOWSHOOKS_CONTRACTID, nsWindowsHooksConstructor },
#endif // XP_WIN
@@ -216,21 +178,16 @@ static const nsModuleComponentInfo compo
},
{ "nsBrowserInstance",
NS_BROWSERINSTANCE_CID,
NS_BROWSERINSTANCE_CONTRACTID,
nsBrowserInstanceConstructor
},
#endif
-#ifdef ALERTS_SERVICE
- { "nsAlertsService", NS_ALERTSSERVICE_CID,
- NS_ALERTSERVICE_CONTRACTID, nsAlertsServiceConstructor },
-#endif
-
#if (!defined(MOZ_XUL_APP)) && !defined(MOZ_MACBROWSER)
{ "Browser Content Handler",
NS_BROWSERCONTENTHANDLER_CID,
NS_CONTENT_HANDLER_CONTRACTID_PREFIX"text/html",
nsBrowserContentHandlerConstructor
},
{ "Browser Content Handler",
NS_BROWSERCONTENTHANDLER_CID,
--- a/xpfe/components/jar.mn
+++ b/xpfe/components/jar.mn
@@ -1,42 +1,11 @@
#ifndef SUPPRESS_CHROME
#ifdef MOZ_SUITE
-#ifndef MOZ_XUL_APP
-comm.jar:
- content/communicator/alerts/alert.xul (alerts/resources/content/alert.xul)
- content/communicator/alerts/alert.js (alerts/resources/content/alert.js)
-* content/cookie/contents.rdf (/toolkit/components/cookie/content/contents.rdf)
- content/cookie/cookieAcceptDialog.xul (/toolkit/components/cookie/content/cookieAcceptDialog.xul)
-* content/cookie/cookieAcceptDialog.js (/toolkit/components/cookie/content/cookieAcceptDialog.js)
-#endif
en-US.jar:
locale/en-US/global-platform/win/nsWindowsHooks.properties (winhooks/locale/en-US/nsWindowsHooks.properties)
-#ifndef MOZ_XUL_APP
- locale/en-US/communicator/update-notifications.properties (updates/resources/locale/en-US/update-notifications.properties)
- locale/en-US/global/downloadProgress.properties (xfer/resources/locale/en-US/downloadProgress.properties)
- locale/en-US/global/filepicker.dtd (filepicker/res/locale/en-US/filepicker.dtd)
- locale/en-US/global/filepicker.properties (filepicker/res/locale/en-US/filepicker.properties)
- locale/en-US/global/console.dtd (console/resources/locale/en-US/console.dtd)
- locale/en-US/global/console.properties (console/resources/locale/en-US/console.properties)
- locale/en-US/global/finddialog.dtd (find/resources/locale/en-US/finddialog.dtd)
- locale/en-US/global/finddialog.properties (find/resources/locale/en-US/finddialog.properties)
-* locale/en-US/cookie/contents.rdf (cookie/locale/en-US/contents.rdf)
- locale/en-US/cookie/cookieAcceptDialog.properties (/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.properties)
- locale/en-US/cookie/cookieAcceptDialog.dtd (/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.dtd)
-
-toolkit.jar:
- content/global/console.js (console/resources/content/console.js)
- content/global/console.xul (console/resources/content/console.xul)
- content/global/console.css (console/resources/content/console.css)
- content/global/consoleBindings.xml (console/resources/content/consoleBindings.xml)
- content/global/finddialog.js (find/resources/finddialog.js)
- content/global/finddialog.xul (find/resources/finddialog.xul)
- content/global/filepicker.js (filepicker/res/content/filepicker.js)
- content/global/filepicker.xul (filepicker/res/content/filepicker.xul)
-#endif
#endif
toolkit.jar:
content/global/autocomplete.xml (autocomplete/resources/content/autocomplete.xml)
content/global/autocomplete.css (autocomplete/resources/content/autocomplete.css)
#endif