зеркало из https://github.com/mozilla/gecko-dev.git
Bug 389085 Move xpfe/components/urlwidget to suite/browser. r=KaiRo,sr=Neil
This commit is contained in:
Родитель
5b0712718f
Коммит
6c9f940933
|
@ -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
|
||||
|
|
|
@ -105,7 +105,7 @@ endif
|
|||
|
||||
ifdef MOZ_SUITE
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
DIRS += urlwidget winhooks
|
||||
DIRS += winhooks
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче