зеркало из https://github.com/mozilla/gecko-dev.git
Bug 383224 - Remove XPInstall bits from the Download Manager. r=mano
This commit is contained in:
Родитель
761d1c97af
Коммит
758d5d3392
|
@ -113,11 +113,9 @@ endif
|
|||
|
||||
ifndef MOZ_SUITE
|
||||
# XXX Suite doesn't want these just yet
|
||||
ifdef MOZ_XPINSTALL
|
||||
ifdef MOZ_RDF
|
||||
DIRS += downloads
|
||||
endif
|
||||
endif
|
||||
endif # MOZ_SUITE
|
||||
|
||||
ifdef MOZ_URL_CLASSIFIER
|
||||
|
|
|
@ -114,12 +114,10 @@ SHARED_LIBRARY_LIBS = \
|
|||
|
||||
ifndef MOZ_SUITE
|
||||
# XXX Suite isn't ready to build this just yet
|
||||
ifdef MOZ_XPINSTALL
|
||||
ifdef MOZ_RDF
|
||||
SHARED_LIBRARY_LIBS += ../downloads/src/$(LIB_PREFIX)download_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef ALERTS_SERVICE
|
||||
SHARED_LIBRARY_LIBS += ../alerts/src/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
|
||||
|
|
|
@ -46,12 +46,10 @@
|
|||
|
||||
#ifndef MOZ_SUITE
|
||||
// XXX Suite isn't ready to include this just yet
|
||||
#ifdef MOZ_XPINSTALL
|
||||
#ifdef MOZ_RDF
|
||||
#include "nsDownloadManager.h"
|
||||
#include "nsDownloadProxy.h"
|
||||
#endif
|
||||
#endif
|
||||
#endif // MOZ_SUITE
|
||||
|
||||
#include "nsTypeAheadFind.h"
|
||||
|
@ -77,12 +75,10 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
|
|||
|
||||
#ifndef MOZ_SUITE
|
||||
// XXX Suite isn't ready to include this just yet
|
||||
#ifdef MOZ_XPINSTALL
|
||||
#ifdef MOZ_RDF
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
|
||||
#endif
|
||||
#endif
|
||||
#endif // MOZ_SUITE
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTypeAheadFind)
|
||||
|
@ -119,7 +115,6 @@ static const nsModuleComponentInfo components[] =
|
|||
#endif
|
||||
#ifndef MOZ_SUITE
|
||||
// XXX Suite isn't ready to include this just yet
|
||||
#ifdef MOZ_XPINSTALL
|
||||
#ifdef MOZ_RDF
|
||||
{ "Download Manager",
|
||||
NS_DOWNLOADMANAGER_CID,
|
||||
|
@ -130,7 +125,6 @@ static const nsModuleComponentInfo components[] =
|
|||
NS_TRANSFER_CONTRACTID,
|
||||
nsDownloadProxyConstructor },
|
||||
#endif
|
||||
#endif
|
||||
#endif // MOZ_SUITE
|
||||
{ "TypeAheadFind Component",
|
||||
NS_TYPEAHEADFIND_CID,
|
||||
|
|
|
@ -62,7 +62,6 @@ REQUIRES = xpcom \
|
|||
webbrowserpersist \
|
||||
appshell \
|
||||
dom \
|
||||
xpinstall \
|
||||
embed_base \
|
||||
alerts \
|
||||
storage \
|
||||
|
|
|
@ -95,12 +95,9 @@
|
|||
<![CDATA[
|
||||
var state = parseInt(this.getAttribute("state"));
|
||||
const dl = Components.interfaces.nsIDownloadManager;
|
||||
const xpi = Components.interfaces.nsIXPInstallManagerUI;
|
||||
return state == dl.DOWNLOAD_NOTSTARTED ||
|
||||
state == dl.DOWNLOAD_DOWNLOADING ||
|
||||
state == dl.DOWNLOAD_PAUSED ||
|
||||
state == xpi.INSTALL_DOWNLOADING ||
|
||||
state == xpi.INSTALL_INSTALLING;
|
||||
state == dl.DOWNLOAD_PAUSED;
|
||||
]]>
|
||||
</getter>
|
||||
</property>
|
||||
|
@ -109,11 +106,9 @@
|
|||
<![CDATA[
|
||||
var state = parseInt(this.getAttribute("state"));
|
||||
const dl = Components.interfaces.nsIDownloadManager;
|
||||
const xpi = Components.interfaces.nsIXPInstallManagerUI;
|
||||
return state == dl.DOWNLOAD_FINISHED ||
|
||||
state == dl.DOWNLOAD_CANCELED ||
|
||||
state == dl.DOWNLOAD_FAILED ||
|
||||
state == xpi.INSTALL_FINISHED;
|
||||
state == dl.DOWNLOAD_FAILED;
|
||||
]]>
|
||||
</getter>
|
||||
</property>
|
||||
|
|
Загрузка…
Ссылка в новой задаче