| 
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:
Changes:
browser/components/BrowserGlue.jsm
 
| ... | ... | @@ -237,26 +237,6 @@ let JSWINDOWACTORS = { |  
| 237 | 237 |      matches: ["about:plugins"],
 |  
| 238 | 238 |    },
 |  
| 239 | 239 |  
 |  
| 240 |  | -  AboutPocket: {
 |  
| 241 |  | -    parent: {
 |  
| 242 |  | -      moduleURI: "resource:///actors/AboutPocketParent.jsm",
 |  
| 243 |  | -    },
 |  
| 244 |  | -    child: {
 |  
| 245 |  | -      moduleURI: "resource:///actors/AboutPocketChild.jsm",
 |  
| 246 |  | -
 |  
| 247 |  | -      events: {
 |  
| 248 |  | -        DOMDocElementInserted: { capture: true },
 |  
| 249 |  | -      },
 |  
| 250 |  | -    },
 |  
| 251 |  | -
 |  
| 252 |  | -    matches: [
 |  
| 253 |  | -      "about:pocket-saved*",
 |  
| 254 |  | -      "about:pocket-signup*",
 |  
| 255 |  | -      "about:pocket-home*",
 |  
| 256 |  | -      "about:pocket-style-guide*",
 |  
| 257 |  | -    ],
 |  
| 258 |  | -  },
 |  
| 259 |  | -
 |  
| 260 | 240 |    AboutPrivateBrowsing: {
 |  
| 261 | 241 |      parent: {
 |  
| 262 | 242 |        moduleURI: "resource:///actors/AboutPrivateBrowsingParent.jsm",
 |  browser/components/about/AboutRedirector.cpp
 
 
| ... | ... | @@ -75,9 +75,11 @@ static const RedirEntry kRedirMap[] = { |  
| 75 | 75 |           nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
 |  
| 76 | 76 |           nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
 |  
| 77 | 77 |           nsIAboutModule::IS_SECURE_CHROME_UI},
 |  
|  | 78 | +#ifndef BASE_BROWSER
 |  
| 78 | 79 |      {"firefoxview", "chrome://browser/content/firefoxview.html",
 |  
| 79 | 80 |       nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
 |  
| 80 | 81 |           nsIAboutModule::HIDE_FROM_ABOUTABOUT},
 |  
|  | 82 | +#endif
 |  
| 81 | 83 |      {"policies", "chrome://browser/content/policies/aboutPolicies.html",
 |  
| 82 | 84 |       nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
 |  
| 83 | 85 |      {"privatebrowsing", "chrome://browser/content/aboutPrivateBrowsing.html",
 |  
| ... | ... | @@ -116,6 +118,7 @@ static const RedirEntry kRedirMap[] = { |  
| 116 | 118 |           nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
 |  
| 117 | 119 |           nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
 |  
| 118 | 120 |           nsIAboutModule::ALLOW_SCRIPT},
 |  
|  | 121 | +#ifndef BASE_BROWSER
 |  
| 119 | 122 |      {"pocket-saved", "chrome://pocket/content/panels/saved.html",
 |  
| 120 | 123 |       nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
 |  
| 121 | 124 |           nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
 |  
| ... | ... | @@ -132,6 +135,7 @@ static const RedirEntry kRedirMap[] = { |  
| 132 | 135 |       nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
 |  
| 133 | 136 |           nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
 |  
| 134 | 137 |           nsIAboutModule::HIDE_FROM_ABOUTABOUT},
 |  
|  | 138 | +#endif
 |  
| 135 | 139 |      {"preferences", "chrome://browser/content/preferences/preferences.xhtml",
 |  
| 136 | 140 |       nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
 |  
| 137 | 141 |      {"downloads",
 |  
| ... | ... | @@ -156,7 +160,8 @@ static const RedirEntry kRedirMap[] = { |  
| 156 | 160 |           nsIAboutModule::HIDE_FROM_ABOUTABOUT |
 |  
| 157 | 161 |           nsIAboutModule::IS_SECURE_CHROME_UI},
 |  
| 158 | 162 |      // The correct URI must be obtained by GetManualChromeURI
 |  
| 159 |  | -    {"manual", "about:blank", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
 |  
|  | 163 | +    {"manual", "about:blank",
 |  
|  | 164 | +     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
 |  
| 160 | 165 |           nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
 |  
| 161 | 166 |           nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
 |  
| 162 | 167 |           nsIAboutModule::IS_SECURE_CHROME_UI},
 |  
| ... | ... | @@ -176,8 +181,7 @@ static nsAutoCString GetAboutModuleName(nsIURI* aURI) { |  
| 176 | 181 |    return path;
 |  
| 177 | 182 |  }
 |  
| 178 | 183 |  
 |  
| 179 |  | -static nsTHashSet<nsCStringHashKey> GetManualLocales()
 |  
| 180 |  | -{
 |  
|  | 184 | +static nsTHashSet<nsCStringHashKey> GetManualLocales() {
 |  
| 181 | 185 |    nsTHashSet<nsCStringHashKey> locales;
 |  
| 182 | 186 |    RefPtr<nsZipArchive> zip = Omnijar::GetReader(Omnijar::APP);
 |  
| 183 | 187 |    UniquePtr<nsZipFind> find;
 |  browser/components/about/components.conf
 
 
| ... | ... | @@ -12,13 +12,8 @@ pages = [ |  
| 12 | 12 |      'home',
 |  
| 13 | 13 |      'logins',
 |  
| 14 | 14 |      'loginsimportreport',
 |  
| 15 |  | -    'firefoxview',
 |  
| 16 | 15 |      'manual',
 |  
| 17 | 16 |      'newtab',
 |  
| 18 |  | -    'pocket-home',
 |  
| 19 |  | -    'pocket-saved',
 |  
| 20 |  | -    'pocket-signup',
 |  
| 21 |  | -    'pocket-style-guide',
 |  
| 22 | 17 |      'policies',
 |  
| 23 | 18 |      'preferences',
 |  
| 24 | 19 |      'privatebrowsing',
 |  browser/components/moz.build
 
 
| ... | ... | @@ -43,7 +43,6 @@ DIRS += [ |  
| 43 | 43 |      "onionservices",
 |  
| 44 | 44 |      "originattributes",
 |  
| 45 | 45 |      "places",
 |  
| 46 |  | -    "pocket",
 |  
| 47 | 46 |      "preferences",
 |  
| 48 | 47 |      "privatebrowsing",
 |  
| 49 | 48 |      "prompts",
 |  
| ... | ... | @@ -69,7 +68,6 @@ DIRS += ["build"] |  
| 69 | 68 |  if CONFIG["NIGHTLY_BUILD"]:
 |  
| 70 | 69 |      DIRS += [
 |  
| 71 | 70 |          "colorways",
 |  
| 72 |  | -        "firefoxview",
 |  
| 73 | 71 |      ]
 |  
| 74 | 72 |  
 |  
| 75 | 73 |  
 |  docshell/base/nsAboutRedirector.cpp
 
 
| ... | ... | @@ -165,8 +165,10 @@ static const RedirEntry kRedirMap[] = { |  
| 165 | 165 |  #endif
 |  
| 166 | 166 |      {"telemetry", "chrome://global/content/aboutTelemetry.xhtml",
 |  
| 167 | 167 |       nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
 |  
|  | 168 | +#ifndef BASE_BROWSER
 |  
| 168 | 169 |      {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml",
 |  
| 169 | 170 |       nsIAboutModule::ALLOW_SCRIPT},
 |  
|  | 171 | +#endif
 |  
| 170 | 172 |      {"webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.html",
 |  
| 171 | 173 |       nsIAboutModule::ALLOW_SCRIPT},
 |  
| 172 | 174 |      {"crashparent", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT},
 |  toolkit/modules/RemotePageAccessManager.jsm
 
 
| ... | ... | @@ -101,29 +101,6 @@ let RemotePageAccessManager = { |  
| 101 | 101 |      "about:plugins": {
 |  
| 102 | 102 |        RPMSendQuery: ["RequestPlugins"],
 |  
| 103 | 103 |      },
 |  
| 104 |  | -    "about:pocket-saved": {
 |  
| 105 |  | -      RPMSendAsyncMessage: ["*"],
 |  
| 106 |  | -      RPMAddMessageListener: ["*"],
 |  
| 107 |  | -      RPMRemoveMessageListener: ["*"],
 |  
| 108 |  | -      RPMGetStringPref: ["extensions.pocket.site"],
 |  
| 109 |  | -    },
 |  
| 110 |  | -    "about:pocket-signup": {
 |  
| 111 |  | -      RPMSendAsyncMessage: ["*"],
 |  
| 112 |  | -      RPMAddMessageListener: ["*"],
 |  
| 113 |  | -      RPMRemoveMessageListener: ["*"],
 |  
| 114 |  | -      RPMGetStringPref: ["extensions.pocket.site"],
 |  
| 115 |  | -    },
 |  
| 116 |  | -    "about:pocket-home": {
 |  
| 117 |  | -      RPMSendAsyncMessage: ["*"],
 |  
| 118 |  | -      RPMAddMessageListener: ["*"],
 |  
| 119 |  | -      RPMRemoveMessageListener: ["*"],
 |  
| 120 |  | -      RPMGetStringPref: ["extensions.pocket.site"],
 |  
| 121 |  | -    },
 |  
| 122 |  | -    "about:pocket-style-guide": {
 |  
| 123 |  | -      RPMSendAsyncMessage: ["*"],
 |  
| 124 |  | -      RPMAddMessageListener: ["*"],
 |  
| 125 |  | -      RPMRemoveMessageListener: ["*"],
 |  
| 126 |  | -    },
 |  
| 127 | 104 |      "about:privatebrowsing": {
 |  
| 128 | 105 |        RPMSendAsyncMessage: [
 |  
| 129 | 106 |          "OpenPrivateWindow",
 |  
 |