Bug 389085 Move xpfe/components/urlwidget to suite/browser. r=KaiRo,sr=Neil
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -694,17 +694,16 @@ xpfe/components/sidebar/src/Makefile
xpfe/components/startup/Makefile
xpfe/components/startup/public/Makefile
xpfe/components/startup/src/Makefile
xpfe/components/autocomplete/Makefile
xpfe/components/autocomplete/public/Makefile
xpfe/components/autocomplete/src/Makefile
xpfe/components/updates/Makefile
xpfe/components/updates/src/Makefile
-xpfe/components/urlwidget/Makefile
xpfe/components/winhooks/Makefile
xpfe/components/windowds/Makefile
xpfe/components/alerts/Makefile
xpfe/components/alerts/public/Makefile
xpfe/components/alerts/src/Makefile
xpfe/components/console/Makefile
xpfe/components/resetPref/Makefile
xpfe/components/build/Makefile
--- a/xpfe/components/Makefile.in
+++ b/xpfe/components/Makefile.in
@@ -100,17 +100,17 @@ DIRS += \
extensions \
$(NULL)
endif
endif
endif
ifdef MOZ_SUITE
ifeq ($(OS_ARCH),WINNT)
-DIRS += urlwidget winhooks
+DIRS += winhooks
endif
endif
# build should be last
DIRS += build
else
# !MOZ_HAVE_BROWSER
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -106,21 +106,19 @@ SHARED_LIBRARY_LIBS += \
LOCAL_INCLUDES += \
-I$(srcdir)/../download-manager/src \
-I$(srcdir)/../history/src \
-I$(srcdir)/../related/src \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
SHARED_LIBRARY_LIBS += \
- ../urlwidget/$(LIB_PREFIX)urlwidgt_s.$(LIB_SUFFIX) \
../winhooks/$(LIB_PREFIX)winhooks_s.$(LIB_SUFFIX) \
$(NULL)
LOCAL_INCLUDES += \
- -I$(srcdir)/../urlwidget \
-I$(srcdir)/../winhooks \
$(NULL)
endif # WINNT
endif # MOZ_SUITE
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
--- a/xpfe/components/build/nsModule.cpp
+++ b/xpfe/components/build/nsModule.cpp
@@ -49,17 +49,16 @@
#include "nsRelatedLinksHandlerImpl.h"
#include "nsGlobalHistory.h"
#include "nsDocShellCID.h"
#include "nsDownloadManager.h"
#include "nsDownloadProxy.h"
#if defined(XP_WIN)
#include "nsWindowsHooks.h"
-#include "nsUrlWidget.h"
#endif // Windows
#endif // MOZ_SUITE
#if !defined(MOZ_MACBROWSER)
#include "nsBrowserStatusFilter.h"
#include "nsBrowserInstance.h"
#endif
@@ -87,17 +86,16 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowser
#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)
#if defined(XP_WIN)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsHooks)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUrlWidget, Init)
#endif // Windows
#endif // MOZ_SUITE
#if (!defined(MOZ_XUL_APP)) && !defined(MOZ_MACBROWSER)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserContentHandler)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsChromeStartupHandler)
#endif
@@ -157,18 +155,16 @@ static const nsModuleComponentInfo compo
{ "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},
#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
#endif // MOZ_SUITE
#if !defined(MOZ_MACBROWSER)
{ NS_BROWSERSTATUSFILTER_CLASSNAME,