diff options
| -rw-r--r-- | docshell/base/nsAboutRedirector.cpp | 2 | ||||
| -rw-r--r-- | docshell/build/nsDocShellModule.cpp | 22 |
2 files changed, 0 insertions, 24 deletions
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp index f57d6c002..e1d883532 100644 --- a/docshell/base/nsAboutRedirector.cpp +++ b/docshell/base/nsAboutRedirector.cpp @@ -119,12 +119,10 @@ static RedirEntry kRedirMap[] = { nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT }, -#ifndef ANDROID { "profiles", "chrome://global/content/aboutProfiles.xhtml", nsIAboutModule::ALLOW_SCRIPT }, -#endif // about:srcdoc is unresolvable by specification. It is included here // because the security manager would disallow srcdoc iframes otherwise. { diff --git a/docshell/build/nsDocShellModule.cpp b/docshell/build/nsDocShellModule.cpp index 3481bd297..fbf2f1002 100644 --- a/docshell/build/nsDocShellModule.cpp +++ b/docshell/build/nsDocShellModule.cpp @@ -25,10 +25,6 @@ #ifdef MOZ_ENABLE_DBUS #include "nsDBusHandlerApp.h" #endif -#if defined(MOZ_WIDGET_ANDROID) -#include "nsExternalSharingAppService.h" -#include "nsExternalURLHandlerService.h" -#endif // session history #include "nsSHEntry.h" @@ -85,10 +81,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(PlatformLocalHandlerApp_t) #ifdef MOZ_ENABLE_DBUS NS_GENERIC_FACTORY_CONSTRUCTOR(nsDBusHandlerApp) #endif -#if defined(MOZ_WIDGET_ANDROID) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsExternalSharingAppService) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsExternalURLHandlerService) -#endif NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(ContentHandlerService, Init) // session history @@ -114,10 +106,6 @@ NS_DEFINE_NAMED_CID(NS_LOCALHANDLERAPP_CID); #ifdef MOZ_ENABLE_DBUS NS_DEFINE_NAMED_CID(NS_DBUSHANDLERAPP_CID); #endif -#if defined(MOZ_WIDGET_ANDROID) -NS_DEFINE_NAMED_CID(NS_EXTERNALSHARINGAPPSERVICE_CID); -NS_DEFINE_NAMED_CID(NS_EXTERNALURLHANDLERSERVICE_CID); -#endif NS_DEFINE_NAMED_CID(NS_SHENTRY_CID); NS_DEFINE_NAMED_CID(NS_SHTRANSACTION_CID); NS_DEFINE_NAMED_CID(NS_SHISTORY_CID); @@ -143,10 +131,6 @@ const mozilla::Module::CIDEntry kDocShellCIDs[] = { #ifdef MOZ_ENABLE_DBUS { &kNS_DBUSHANDLERAPP_CID, false, nullptr, nsDBusHandlerAppConstructor }, #endif -#if defined(MOZ_WIDGET_ANDROID) - { &kNS_EXTERNALSHARINGAPPSERVICE_CID, false, nullptr, nsExternalSharingAppServiceConstructor }, - { &kNS_EXTERNALURLHANDLERSERVICE_CID, false, nullptr, nsExternalURLHandlerServiceConstructor }, -#endif { &kNS_SHENTRY_CID, false, nullptr, nsSHEntryConstructor }, { &kNS_SHTRANSACTION_CID, false, nullptr, nsSHTransactionConstructor }, { &kNS_SHISTORY_CID, false, nullptr, nsSHistoryConstructor }, @@ -183,9 +167,7 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = { { NS_ABOUT_MODULE_CONTRACTID_PREFIX "performance", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "plugins", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "serviceworkers", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, -#ifndef ANDROID { NS_ABOUT_MODULE_CONTRACTID_PREFIX "profiles", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, -#endif { NS_ABOUT_MODULE_CONTRACTID_PREFIX "srcdoc", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "support", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "telemetry", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, @@ -206,10 +188,6 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = { #ifdef MOZ_ENABLE_DBUS { NS_DBUSHANDLERAPP_CONTRACTID, &kNS_DBUSHANDLERAPP_CID }, #endif -#if defined(MOZ_WIDGET_ANDROID) - { NS_EXTERNALSHARINGAPPSERVICE_CONTRACTID, &kNS_EXTERNALSHARINGAPPSERVICE_CID }, - { NS_EXTERNALURLHANDLERSERVICE_CONTRACTID, &kNS_EXTERNALURLHANDLERSERVICE_CID }, -#endif { NS_SHENTRY_CONTRACTID, &kNS_SHENTRY_CID }, { NS_SHTRANSACTION_CONTRACTID, &kNS_SHTRANSACTION_CID }, { NS_SHISTORY_CONTRACTID, &kNS_SHISTORY_CID }, |