Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits: 4d0aac78 by Pier Angelo Vendrame at 2023-02-15T14:40:43+00:00 fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser

- - - - - a19c9288 by Pier Angelo Vendrame at 2023-02-15T14:40:43+00:00 squash! Bug 31575: Disable Firefox Home (Activity Stream)

Bug 41624: Disable about:pocket-* pages and about:firefoxview.

- - - - - bd9cd0a7 by Pier Angelo Vendrame at 2023-02-15T14:40:43+00:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances

Bug 41624: Disable the about:url-classifier page

- - - - -

6 changed files:

- browser/components/BrowserGlue.jsm - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/moz.build - docshell/base/nsAboutRedirector.cpp - toolkit/modules/RemotePageAccessManager.jsm

Changes:

===================================== browser/components/BrowserGlue.jsm ===================================== @@ -237,26 +237,6 @@ let JSWINDOWACTORS = { matches: ["about:plugins"], },

- AboutPocket: { - parent: { - moduleURI: "resource:///actors/AboutPocketParent.jsm", - }, - child: { - moduleURI: "resource:///actors/AboutPocketChild.jsm", - - events: { - DOMDocElementInserted: { capture: true }, - }, - }, - - matches: [ - "about:pocket-saved*", - "about:pocket-signup*", - "about:pocket-home*", - "about:pocket-style-guide*", - ], - }, - AboutPrivateBrowsing: { parent: { moduleURI: "resource:///actors/AboutPrivateBrowsingParent.jsm",

===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -75,9 +75,11 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::IS_SECURE_CHROME_UI}, +#ifndef BASE_BROWSER {"firefoxview", "chrome://browser/content/firefoxview.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, +#endif {"policies", "chrome://browser/content/policies/aboutPolicies.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, {"privatebrowsing", "chrome://browser/content/aboutPrivateBrowsing.html", @@ -116,6 +118,7 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT}, +#ifndef BASE_BROWSER {"pocket-saved", "chrome://pocket/content/panels/saved.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | @@ -132,6 +135,7 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, +#endif {"preferences", "chrome://browser/content/preferences/preferences.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, {"downloads", @@ -156,7 +160,8 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::IS_SECURE_CHROME_UI}, // The correct URI must be obtained by GetManualChromeURI - {"manual", "about:blank", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + {"manual", "about:blank", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | nsIAboutModule::IS_SECURE_CHROME_UI}, @@ -176,8 +181,7 @@ static nsAutoCString GetAboutModuleName(nsIURI* aURI) { return path; }

-static nsTHashSet<nsCStringHashKey> GetManualLocales() -{ +static nsTHashSet<nsCStringHashKey> GetManualLocales() { nsTHashSet<nsCStringHashKey> locales; RefPtr<nsZipArchive> zip = Omnijar::GetReader(Omnijar::APP); UniquePtr<nsZipFind> find;

===================================== browser/components/about/components.conf ===================================== @@ -12,13 +12,8 @@ pages = [ 'home', 'logins', 'loginsimportreport', - 'firefoxview', 'manual', 'newtab', - 'pocket-home', - 'pocket-saved', - 'pocket-signup', - 'pocket-style-guide', 'policies', 'preferences', 'privatebrowsing',

===================================== browser/components/moz.build ===================================== @@ -43,7 +43,6 @@ DIRS += [ "onionservices", "originattributes", "places", - "pocket", "preferences", "privatebrowsing", "prompts", @@ -69,7 +68,6 @@ DIRS += ["build"] if CONFIG["NIGHTLY_BUILD"]: DIRS += [ "colorways", - "firefoxview", ]

===================================== docshell/base/nsAboutRedirector.cpp ===================================== @@ -165,8 +165,10 @@ static const RedirEntry kRedirMap[] = { #endif {"telemetry", "chrome://global/content/aboutTelemetry.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, +#ifndef BASE_BROWSER {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml", nsIAboutModule::ALLOW_SCRIPT}, +#endif {"webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.html", nsIAboutModule::ALLOW_SCRIPT}, {"crashparent", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT},

===================================== toolkit/modules/RemotePageAccessManager.jsm ===================================== @@ -101,29 +101,6 @@ let RemotePageAccessManager = { "about:plugins": { RPMSendQuery: ["RequestPlugins"], }, - "about:pocket-saved": { - RPMSendAsyncMessage: ["*"], - RPMAddMessageListener: ["*"], - RPMRemoveMessageListener: ["*"], - RPMGetStringPref: ["extensions.pocket.site"], - }, - "about:pocket-signup": { - RPMSendAsyncMessage: ["*"], - RPMAddMessageListener: ["*"], - RPMRemoveMessageListener: ["*"], - RPMGetStringPref: ["extensions.pocket.site"], - }, - "about:pocket-home": { - RPMSendAsyncMessage: ["*"], - RPMAddMessageListener: ["*"], - RPMRemoveMessageListener: ["*"], - RPMGetStringPref: ["extensions.pocket.site"], - }, - "about:pocket-style-guide": { - RPMSendAsyncMessage: ["*"], - RPMAddMessageListener: ["*"], - RPMRemoveMessageListener: ["*"], - }, "about:privatebrowsing": { RPMSendAsyncMessage: [ "OpenPrivateWindow",

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a697a2c...