summaryrefslogtreecommitdiffstats
path: root/application/basilisk/components
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-04-13 06:52:08 -0400
committerMatt A. Tobin <email@mattatobin.com>2019-04-13 06:52:08 -0400
commit0ea4dabdeaa5e3f198bece363fa45c032b9f3cb7 (patch)
tree9055c7791434c8502f7f075bb2a694a57d62e078 /application/basilisk/components
parent8e5056ce2fa45726c5498c04808b7b4b9ee107e0 (diff)
downloadUXP-0ea4dabdeaa5e3f198bece363fa45c032b9f3cb7.tar
UXP-0ea4dabdeaa5e3f198bece363fa45c032b9f3cb7.tar.gz
UXP-0ea4dabdeaa5e3f198bece363fa45c032b9f3cb7.tar.lz
UXP-0ea4dabdeaa5e3f198bece363fa45c032b9f3cb7.tar.xz
UXP-0ea4dabdeaa5e3f198bece363fa45c032b9f3cb7.zip
[BASILISK] Restore Tabs from Other Devices history menu item and Add First Sync Progress
Diffstat (limited to 'application/basilisk/components')
-rw-r--r--application/basilisk/components/about/AboutRedirector.cpp6
-rw-r--r--application/basilisk/components/build/nsModule.cpp3
2 files changed, 9 insertions, 0 deletions
diff --git a/application/basilisk/components/about/AboutRedirector.cpp b/application/basilisk/components/about/AboutRedirector.cpp
index 9de48b090..d52b063e2 100644
--- a/application/basilisk/components/about/AboutRedirector.cpp
+++ b/application/basilisk/components/about/AboutRedirector.cpp
@@ -92,10 +92,16 @@ static RedirEntry kRedirMap[] = {
"welcomeback", "chrome://browser/content/aboutWelcomeBack.xhtml",
nsIAboutModule::ALLOW_SCRIPT
},
+#ifdef MOZ_SERVICES_SYNC
+ {
+ "sync-progress", "chrome://browser/content/sync/progress.xhtml",
+ nsIAboutModule::ALLOW_SCRIPT
+ },
{
"sync-tabs", "chrome://browser/content/sync/aboutSyncTabs.xul",
nsIAboutModule::ALLOW_SCRIPT
},
+#endif
{ "home", "chrome://browser/content/abouthome/aboutHome.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
diff --git a/application/basilisk/components/build/nsModule.cpp b/application/basilisk/components/build/nsModule.cpp
index 7ae23aa76..3fdde8823 100644
--- a/application/basilisk/components/build/nsModule.cpp
+++ b/application/basilisk/components/build/nsModule.cpp
@@ -97,7 +97,10 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "searchreset", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "sessionrestore", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "welcomeback", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
+#ifdef MOZ_SERVICES_SYNC
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "sync-tabs", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
+ { NS_ABOUT_MODULE_CONTRACTID_PREFIX "sync-progress", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
+#endif
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "home", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "newtab", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "preferences", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },