MB 63: Customize some about pages for Mullvad Browser

Also: mullvad-browser#57: Purge unneeded about: pages

MB 63: Customize some about pages for Mullvad Browser
4092c498 · Pier Angelo Vendrame · 64d807af · 4092c498 · 4092c498 · 4092c498
Verified Commit 4092c498 authored Feb 16, 2023 by Pier Angelo Vendrame
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -84,7 +84,7 @@ static const RedirEntry kRedirMap[] = {
    {"profiling",
     "chrome://devtools/content/performance-new/aboutprofiling/index.html",
     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
-    {"rights", "https://www.mozilla.org/about/legal/terms/firefox/",
+    {"rights", "chrome://global/content/aboutRights.xhtml",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
         nsIAboutModule::URI_MUST_LOAD_IN_CHILD},
 #ifndef BASE_BROWSER_VERSION


--- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp
@@ -203,6 +203,8 @@ static const RedirEntry kRedirMap[] = {
 #    endif
         nsIAboutModule::ALLOW_SCRIPT},
 #  endif
+#endif
+#ifdef MULLVAD_BROWSER
    {"telemetry", "chrome://global/content/aboutTelemetry.xhtml",
     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
 #endif


--- a/docshell/build/components.conf
+++ b/docshell/build/components.conf
@@ -30,6 +30,7 @@ about_pages = [
    'srcdoc',
    'support',
    'translations',
+    'telemetry',
    # Removed 'url-classifier'. tor-browser#42831.
 ]

@@ -37,8 +38,6 @@ if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android':
    about_pages.append('addons')
 if defined('MOZ_CRASHREPORTER'):
    about_pages.append('crashes')
-if defined('MOZ_TELEMETRY_REPORTING'):
-    about_pages.append('telemetry')
 if defined('MOZ_WEBRTC'):
    about_pages.append('webrtc')
 if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android':


--- a/toolkit/content/aboutRightsMullvad.xhtml
+++ b/toolkit/content/aboutRightsMullvad.xhtml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html [ <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+%htmlDTD; ]>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta
+      http-equiv="Content-Security-Policy"
+      content="default-src chrome:; object-src 'none'"
+    />
+    <meta name="color-scheme" content="light dark" />
+    <title data-l10n-id="rights-title"></title>
+    <link
+      rel="stylesheet"
+      href="chrome://global/skin/in-content/info-pages.css"
+      type="text/css"
+    />
+    <link rel="localization" href="branding/brand.ftl" />
+    <link rel="localization" href="toolkit/about/aboutRights.ftl" />
+    <link rel="localization" href="toolkit/global/mullvad-browser.ftl" />
+  </head>
+
+  <body id="your-rights" class="aboutPageWideContainer">
+    <div class="container">
+      <h1 data-l10n-id="rights-title"></h1>
+
+      <p data-l10n-id="rights-mullvad-intro"></p>
+      <p data-l10n-id="rights-mullvad-you-should-know"></p>
+
+      <ul>
+        <li data-l10n-id="rights-intro-point-1">
+          <a
+            href="http://www.mozilla.org/MPL/"
+            data-l10n-name="mozilla-public-license-link"
+          ></a>
+        </li>
+        <li data-l10n-id="rights-mullvad-trademarks"></li>
+      </ul>
+    </div>
+  </body>
+</html>
--- a/toolkit/content/aboutTelemetryMullvad.xhtml
+++ b/toolkit/content/aboutTelemetryMullvad.xhtml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html [ <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+%htmlDTD; ]>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta
+      http-equiv="Content-Security-Policy"
+      content="default-src chrome:; object-src 'none'"
+    />
+    <meta name="color-scheme" content="light dark" />
+    <title data-l10n-id="telemetry-title"></title>
+    <link
+      rel="stylesheet"
+      href="chrome://global/skin/in-content/info-pages.css"
+      type="text/css"
+    />
+    <link rel="localization" href="branding/brand.ftl" />
+    <link rel="localization" href="toolkit/global/mullvad-browser.ftl" />
+  </head>
+
+  <body id="your-rights" class="aboutPageWideContainer">
+    <div class="container">
+      <h1 data-l10n-id="telemetry-title"></h1>
+      <p data-l10n-id="telemetry-description"></p>
+    </div>
+  </body>
+</html>
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -43,6 +43,9 @@ toolkit.jar:
   content/global/aboutTelemetry.js
   content/global/aboutTelemetry.xhtml
   content/global/aboutTelemetry.css
+#endif
+#ifdef MULLVAD_BROWSER
+   content/global/aboutTelemetry.xhtml          (aboutTelemetryMullvad.xhtml)
 #endif
   content/global/aboutUrlClassifier.js
   content/global/aboutUrlClassifier.xhtml
@@ -191,3 +194,5 @@ toolkit.jar:
   content/global/vendor/react-transition-group.js (vendor/react/react-transition-group.js)
   content/global/vendor/redux.js (vendor/react/redux.js)
   content/global/vendor/react-redux.js (vendor/react/react-redux.js)
+
+   content/global/aboutRights.xhtml           (aboutRightsMullvad.xhtml)