[tor-commits] [Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] 2 commits: fixup! Firefox preference overrides.

[morgan (@morgan)]

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser


Commits:
64b4b81e by Henry Wilkes at 2024-09-18T18:16:55+00:00
fixup! Firefox preference overrides.

Bug 42718: Drop unused browser.tabs.firefox-view preference.

- - - - -
7414b290 by Henry Wilkes at 2024-09-18T18:16:56+00:00
fixup! Bug 42037: Disable about:firefoxview page

Bug 42718: Always hide the firefox view button.

Also, ensure that `FirefoxViewHandler.openTab` returns early rather than
throwing.

- - - - -


3 changed files:

- browser/app/profile/001-base-profile.js
- browser/base/content/browser.js
- browser/themes/shared/tabbrowser/tabs.css


Changes:

=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -17,9 +17,6 @@ pref("startup.homepage_welcome_url.additional", "");
 // Disable Firefox Welcome Dialog
 pref("browser.aboutwelcome.enabled", false);
 
-// Disable the Firefox View tab (tor-browser#41876)
-pref("browser.tabs.firefox-view", false, locked);
-
 #if MOZ_UPDATE_CHANNEL == release
 // tor-browser#42640: Disable Firefox Flame buttond due to unknown interactions with New Identity
 pref("browser.privatebrowsing.resetPBM.enabled", false, locked);


=====================================
browser/base/content/browser.js
=====================================
@@ -8079,6 +8079,11 @@ var FirefoxViewHandler = {
     }
   },
   openTab(section) {
+    if (AppConstants.BASE_BROWSER_VERSION) {
+      // about:firefoxview is disabled. tor-browser#42037.
+      return;
+    }
+
     if (!CustomizableUI.getPlacementOfWidget(this.BUTTON_ID)) {
       CustomizableUI.addWidgetToArea(
         this.BUTTON_ID,


=====================================
browser/themes/shared/tabbrowser/tabs.css
=====================================
@@ -747,17 +747,28 @@
 
 /* Firefox View button and menu item */
 
-:root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
-:root[privatebrowsingmode]:not([firefoxviewhidden]) :is(
+/* about:firefoxview is disabled in Base Browser. See tor-browser#42037.
+ * Therefore we always hide #firefox-view-button, regardless of private
+ * browsing. Here we only want to draw the border if there is a non-hidden
+ * toolbar item before the tabs.
+ * NOTE: Expect merge conflict from bugzilla bug 1917595 and bug 1917599. In
+ * these cases we want to keep our selector as-is. */
+:root :is(
   toolbarbutton:not(#firefox-view-button),
   toolbarpaletteitem:not(#wrapper-firefox-view-button)
-) + #tabbrowser-tabs {
+) ~ #tabbrowser-tabs {
   border-inline-start: 1px solid color-mix(in srgb, currentColor 25%, transparent);
   padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px);
   margin-inline-start: 2px;
 }
 
-:root[privatebrowsingmode] :is(#firefox-view-button, #menu_openFirefoxView) {
+/* about:firefoxview is disabled in Base Browser. Always hide the toolbar button
+ * and menu item regardless of private browsing. See tor-browser#42037.
+ * NOTE: We also hide #wrapper-firefox-view-button, which is used during
+ * customization.
+ * NOTE: Expect merge conflict from bugzilla bug 1903812 and bug 1917599. In
+ * these cases we want to keep our selector as-is. */
+#firefox-view-button, #wrapper-firefox-view-button, #menu_openFirefoxView {
   display: none;
 }
 



View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/a64e84bc5ecc106cb2d9adaf1cd9d31aa5ff1bdf...7414b2907a0d550a1af84e7debe53d6bd3cf1b35

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/a64e84bc5ecc106cb2d9adaf1cd9d31aa5ff1bdf...7414b2907a0d550a1af84e7debe53d6bd3cf1b35
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240918/7f6b2605/attachment-0001.htm>