summaryrefslogtreecommitdiffstats
path: root/docshell
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-04-07 06:10:48 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-04-07 06:10:48 -0400
commitfb84e0f3226f1b9233aa2a6bfc55c38110694ffd (patch)
treebce8ff0f1504b3d88c587ba2a82ac529d4027b67 /docshell
parentb16ab3f38305c8d92b1d049e90656246a5cd3178 (diff)
downloadUXP-fb84e0f3226f1b9233aa2a6bfc55c38110694ffd.tar
UXP-fb84e0f3226f1b9233aa2a6bfc55c38110694ffd.tar.gz
UXP-fb84e0f3226f1b9233aa2a6bfc55c38110694ffd.tar.lz
UXP-fb84e0f3226f1b9233aa2a6bfc55c38110694ffd.tar.xz
UXP-fb84e0f3226f1b9233aa2a6bfc55c38110694ffd.zip
Make about:logopage available to any browser that opts into MOZ_PHOENIX
Follow up to 5e8e0689c
Diffstat (limited to 'docshell')
-rw-r--r--docshell/base/nsAboutRedirector.cpp7
-rw-r--r--docshell/build/nsDocShellModule.cpp3
2 files changed, 10 insertions, 0 deletions
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
index e7d362864..d033ca80c 100644
--- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp
@@ -75,6 +75,13 @@ static RedirEntry kRedirMap[] = {
// Linkable for testing reasons.
nsIAboutModule::MAKE_LINKABLE
},
+#ifdef MOZ_PHOENIX
+ {
+ "logopage", "chrome://global/content/logopage.xhtml",
+ nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+ nsIAboutModule::HIDE_FROM_ABOUTABOUT
+ },
+#endif
{
"memory", "chrome://global/content/aboutMemory.xhtml",
nsIAboutModule::ALLOW_SCRIPT
diff --git a/docshell/build/nsDocShellModule.cpp b/docshell/build/nsDocShellModule.cpp
index d43c305f9..e37ced4a9 100644
--- a/docshell/build/nsDocShellModule.cpp
+++ b/docshell/build/nsDocShellModule.cpp
@@ -174,6 +174,9 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = {
#endif
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "license", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "logo", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
+#ifdef MOZ_PHOENIX
+ { NS_ABOUT_MODULE_CONTRACTID_PREFIX "logopage", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
+#endif
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "memory", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "mozilla", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "neterror", &kNS_ABOUT_REDIRECTOR_MODULE_CID },