Commits:
- 
feffd625
 by Henry Wilkes   at 2023-02-08T10:21:04+00:00 
 
dropme! Partial revert of "Bug 10760: Integrate TorButton to TorBrowser core"
Bug 41609: Revert the activity stream changes.
 
 
- 
6cd4fa5a
 by Henry Wilkes   at 2023-02-08T10:21:05+00:00 
 
fixup! Firefox preference overrides.
Bug 41609: Set home page and new tab to about:blank in base-browser.
 
 
- 
ed354cc8
 by Henry Wilkes   at 2023-02-08T10:21:38+00:00 
 
Bug 31575: Disable Firefox Home (Activity Stream)
Treat about:blank as the default home page and new tab page.
Avoid loading AboutNewTab in BrowserGlue.jsm in order
to avoid several network requests that we do not need.
 
 
- 
6793375e
 by Henry Wilkes   at 2023-02-08T10:22:35+00:00 
 
fixup! Bug 10760: Integrate TorButton to TorBrowser core
Bug 41609: Change the default home page from about:blank to about:tor
 
 
- 
93a409f1
 by Henry Wilkes   at 2023-02-08T10:22:36+00:00 
 
amend! Bug 10760: Integrate TorButton to TorBrowser core
Bug 10760: Integrate TorButton to TorBrowser core
Because of the non-restartless nature of Torbutton, it required
a two-stage installation process. On mobile, it was a problem,
because it was not loading when the user opened the browser for
the first time.
Moving it to tor-browser and making it a system extension allows it
to load when the user opens the browser for first time.
Additionally, this patch also fixes Bug 27611.
Bug 26321: New Circuit and New Identity menu items
Bug 14392: Make about:tor behave like other initial pages.
Bug 25013: Add torbutton as a tor-browser submodule
Bug 31575: Replace Firefox Home (newtab) with about:tor
 
 
 
3 changed files:
Changes:
browser/app/profile/001-base-profile.js
 
| ... | 
... | 
@@ -4,6 +4,11 @@ | 
 
| 
4
 | 
4
 | 
 // Use the OS locale by default (tor-browser#17400)
  | 
 
| 
5
 | 
5
 | 
 pref("intl.locale.requested", "");
 | 
 
| 
6
 | 
6
 | 
 
  | 
 
| 
 
 | 
7
 | 
+// Home page and new tab is blank rather than Firefox Home (Activity Stream).
  | 
 
| 
 
 | 
8
 | 
+// tor-browser#31575 and tor-browser#30662
  | 
 
| 
 
 | 
9
 | 
+pref("browser.startup.homepage", "about:blank");
 | 
 
| 
 
 | 
10
 | 
+pref("browser.newtabpage.enabled", false);
 | 
 
| 
 
 | 
11
 | 
+
  | 
 
| 
7
 | 
12
 | 
 // Disable initial homepage notifications
  | 
 
| 
8
 | 
13
 | 
 pref("browser.search.update", false);
 | 
 
| 
9
 | 
14
 | 
 pref("startup.homepage_welcome_url", "");
 | 
 
| ... | 
... | 
@@ -151,7 +156,6 @@ pref("services.sync.engine.passwords", false); | 
 
| 
151
 | 
156
 | 
 pref("services.sync.engine.prefs", false);
 | 
 
| 
152
 | 
157
 | 
 pref("services.sync.engine.tabs", false);
 | 
 
| 
153
 | 
158
 | 
 pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/
 | 
 
| 
154
 | 
 
 | 
-pref("browser.newtabpage.enabled", false);
 | 
 
| 
155
 | 
159
 | 
 pref("browser.search.region", "US"); // The next two prefs disable GeoIP search lookups (#16254)
 | 
 
| 
156
 | 
160
 | 
 pref("browser.search.geoip.url", "");
 | 
 
| 
157
 | 
161
 | 
 pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion fixups
 | 
 
 
 
browser/components/BrowserGlue.jsm
 
| ... | 
... | 
@@ -5899,7 +5899,7 @@ var AboutHomeStartupCache = { | 
 
| 
5899
 | 
5899
 | 
       return { pageInputStream: null, scriptInputStream: null };
 | 
 
| 
5900
 | 
5900
 | 
     }
  | 
 
| 
5901
 | 
5901
 | 
 
  | 
 
| 
5902
 | 
 
 | 
-    this.log.error("Activity Stream is disabled in Tor Browser.");
 | 
 
| 
 
 | 
5902
 | 
+    this.log.error("Activity Stream is disabled.");
 | 
 
| 
5903
 | 
5903
 | 
     return { pageInputStream: null, scriptInputStream: null };
 | 
 
| 
5904
 | 
5904
 | 
   },
  | 
 
| 
5905
 | 
5905
 | 
 
  | 
 
 
 
browser/components/preferences/home.js
 
| ... | 
... | 
@@ -380,10 +380,14 @@ var gHomePane = { | 
 
| 
380
 | 
380
 | 
 
  | 
 
| 
381
 | 
381
 | 
     if (controllingExtension && controllingExtension.id) {
 | 
 
| 
382
 | 
382
 | 
       newValue = controllingExtension.id;
  | 
 
| 
383
 | 
 
 | 
-    } else if (isDefault) {
 | 
 
| 
384
 | 
 
 | 
-      newValue = this.HOME_MODE_FIREFOX_HOME;
  | 
 
| 
385
 | 
383
 | 
     } else if (isBlank) {
 | 
 
| 
 
 | 
384
 | 
+      // For base-browser, we want to check isBlank first since the default page
  | 
 
| 
 
 | 
385
 | 
+      // is also the blank page, but we only have a menu option for
  | 
 
| 
 
 | 
386
 | 
+      // HOME_MODE_BLANK, rather than HOME_MODE_FIREFOX_HOME.
  | 
 
| 
 
 | 
387
 | 
+      // See tor-browser#41609.
  | 
 
| 
386
 | 
388
 | 
       newValue = this.HOME_MODE_BLANK;
  | 
 
| 
 
 | 
389
 | 
+    } else if (isDefault) {
 | 
 
| 
 
 | 
390
 | 
+      newValue = this.HOME_MODE_FIREFOX_HOME;
  | 
 
| 
387
 | 
391
 | 
     } else {
 | 
 
| 
388
 | 
392
 | 
       newValue = this.HOME_MODE_CUSTOM;
  | 
 
| 
389
 | 
393
 | 
     }
  | 
 
 
 
 
 |