From 6c9f94093399d3cf3e2298542acca132a56c1b2b Mon Sep 17 00:00:00 2001 From: "bugzilla@standard8.demon.co.uk" Date: Thu, 2 Aug 2007 10:18:33 -0700 Subject: [PATCH] Bug 389085 Move xpfe/components/urlwidget to suite/browser. r=KaiRo,sr=Neil --- allmakefiles.sh | 1 - xpfe/components/Makefile.in | 2 +- xpfe/components/build/Makefile.in | 2 -- xpfe/components/build/nsModule.cpp | 4 ---- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/allmakefiles.sh b/allmakefiles.sh index 1f2edc3deba95..b0d9214f0f02d 100755 --- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -699,7 +699,6 @@ 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 diff --git a/xpfe/components/Makefile.in b/xpfe/components/Makefile.in index 8aeade78ed169..be58164e708a0 100644 --- a/xpfe/components/Makefile.in +++ b/xpfe/components/Makefile.in @@ -105,7 +105,7 @@ endif ifdef MOZ_SUITE ifeq ($(OS_ARCH),WINNT) -DIRS += urlwidget winhooks +DIRS += winhooks endif endif diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in index ccac1744c87ad..fda7ed7d7c2ec 100644 --- a/xpfe/components/build/Makefile.in +++ b/xpfe/components/build/Makefile.in @@ -111,11 +111,9 @@ LOCAL_INCLUDES += \ 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 diff --git a/xpfe/components/build/nsModule.cpp b/xpfe/components/build/nsModule.cpp index 562397019aec6..948631e96a951 100644 --- a/xpfe/components/build/nsModule.cpp +++ b/xpfe/components/build/nsModule.cpp @@ -54,7 +54,6 @@ #if defined(XP_WIN) #include "nsWindowsHooks.h" -#include "nsUrlWidget.h" #endif // Windows #endif // MOZ_SUITE @@ -92,7 +91,6 @@ 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 @@ -162,8 +160,6 @@ static const nsModuleComponentInfo components[] = { 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