Commit cba29173 authored by henry's avatar henry
Browse files

fixup! BB 44711: Hide unwanted setting controls in Base Browser. 

BB 45043: Re-add missing changes to settings after 152 rebase.

Drop changes to "addresses" and "payments" since these now properly
hidden without the formautofill extension being in the build.
parent bc769667

browser/components/preferences/config/passwords-autofill.mjs

+0 −6
Original line number Diff line number Diff line
@@ -757,9 +757,6 @@ SettingGroupManager.registerGroups({ 
    ],

  },

  managePayments: {

    // Hide the payments settings. tor-browser#44460.

    hidden: true,

    hiddenFromSearch: true,

    items: [

      {

        id: "add-payment-button",
@@ -776,9 +773,6 @@ SettingGroupManager.registerGroups({ 
    ],

  },

  manageAddresses: {

    // Hide the addresses settings. tor-browser#44460.

    hidden: true,

    hiddenFromSearch: true,

    items: [

      {

        id: "add-address-button",

browser/components/preferences/config/privacy.mjs

+11 −0
Original line number Diff line number Diff line
@@ -2226,6 +2226,13 @@ Preferences.addSetting({ 
  id: "relayIntegration",

  deps: ["savePasswords", "relayFeature"],

  visible: () => {

    // Hide Firefox Relay. tor-browser#43109 and tor-browser#42814.

    // NOTE: Whilst `FirefoxRelay.isDisabled` is `true` due to preferences we

    // set for Base Browser, `FirefoxRelay.isAvailable` is also `true` in this

    // case, hence why we still need to hide this unconditionally.

    if (lazy.AppConstants.BASE_BROWSER_VERSION) {

      return false;

    }

    return lazy.FirefoxRelay.isAvailable;

  },

  disabled: ({ savePasswords, relayFeature }) => {
@@ -3498,6 +3505,8 @@ Preferences.addSetting({ 


Preferences.addSetting({

  id: "etpStatusBoxGroup",

  // Hide enhanced tracking protection (ETP). tor-browser#26345.

  visible: () => false,

});



Preferences.addSetting({
@@ -3530,6 +3539,8 @@ Preferences.addSetting({ 


Preferences.addSetting({

  id: "protectionsDashboardLink",

  // Hide enhanced tracking protection (ETP). tor-browser#26345.

  visible: () => false,

});



Preferences.addSetting({

browser/components/preferences/privacy.js

+0 −6
Original line number Diff line number Diff line
@@ -640,12 +640,6 @@ var gPrivacyPane = { 
    initSettingGroup("cookiesAndSiteData2");

    initSettingGroup("certificates");

    initSettingGroup("ipprotection");

    // NOTE: "managePayments" and "manageAddresses" are usually initialised by

    // FormAutofillPreferences.sys.mjs via FormAutofillStatus. But this never

    // runs because the "autofill" extension is excluded from the build. So we

    // initialise them ourselves with an empty config. See tor-browser#44630.

    initSettingGroup("managePayments");

    initSettingGroup("manageAddresses");

    initSettingGroup("history");

    initSettingGroup("history2");

    initSettingGroup("permissions");