Commit f7d1d486 authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

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

BB 44630: Hide settings using the config.
parent 13ec314c
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -86,6 +86,11 @@ Preferences.addSetting(
Preferences.addSetting({
  id: "alwaysUnderlineLinks",
  pref: "layout.css.always_underline_links",
  // Hide "always underline links" because it can be used for fingerprinting. At
  // the time of implementation, this is the case with or without RFP, so we
  // hide this unconditionally.
  // tor-browser#43117.
  visible: () => false,
});

Preferences.addSetting({
@@ -105,6 +110,12 @@ Preferences.addSetting({
Preferences.addSetting({
  id: "useSmoothScrolling",
  pref: "general.smoothScroll",
  deps: ["resistFingerprinting"],
  visible: ({ resistFingerprinting }) => {
    // Hide "smooth scrolling" when using resist fingerprinting (RFP) because
    // the preference should be ignored. tor-browser#42070.
    return !resistFingerprinting.value;
  },
});
Preferences.addSetting({
  id: "useOverlayScrollbars",
+13 −1
Original line number Diff line number Diff line
@@ -34,11 +34,17 @@ Preferences.addSetting({

Preferences.addSetting({
  id: "web-appearance-override-warning",
  deps: ["resistFingerprinting"],
  setup: emitChange => {
    FORCED_COLORS_QUERY.addEventListener("change", emitChange);
    return () => FORCED_COLORS_QUERY.removeEventListener("change", emitChange);
  },
  visible: () => {
  visible: ({ resistFingerprinting }) => {
    // Hide web appearance settings when using resist fingerprinting (RFP).
    // tor-browser#41739.
    if (resistFingerprinting.value) {
      return false;
    }
    return FORCED_COLORS_QUERY.matches;
  },
});
@@ -48,6 +54,12 @@ Preferences.addSetting(
    id: "web-appearance-chooser",
    themeNames: ["dark", "light", "auto"],
    pref: "layout.css.prefers-color-scheme.content-override",
    deps: ["resistFingerprinting"],
    visible: ({ resistFingerprinting }) => {
      // Hide web appearance settings when using resist fingerprinting (RFP).
      // tor-browser#41739.
      return !resistFingerprinting.value;
    },
    setup(emitChange) {
      Services.obs.addObserver(emitChange, "look-and-feel-changed");
      return () =>
+6 −0
Original line number Diff line number Diff line
@@ -760,6 +760,9 @@ SettingGroupManager.registerGroups({
    ],
  },
  managePayments: {
    // Hide the payments settings. tor-browser#44460.
    hidden: true,
    hiddenFromSearch: true,
    items: [
      {
        id: "add-payment-button",
@@ -776,6 +779,9 @@ SettingGroupManager.registerGroups({
    ],
  },
  manageAddresses: {
    // Hide the addresses settings. tor-browser#44460.
    hidden: true,
    hiddenFromSearch: true,
    items: [
      {
        id: "add-address-button",
+10 −1
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ Preferences.addAll([
  { id: "privacy.fingerprintingProtection.pbmode", type: "bool" },

  // Resist Fingerprinting
  { id: "privacy.resistFingerprinting", type: "bool" },
  { id: "privacy.resistFingerprinting.pbmode", type: "bool" },

  // Social tracking
@@ -1924,6 +1923,8 @@ if (SECURITY_PRIVACY_STATUS_CARD_ENABLED) {
      "etpCustomEnabled",
      ...SECURITY_WARNINGS.map(warning => warning.id),
    ],
    // Hide the privacy card. tor-browser#44829.
    visible: () => false,
  });

  Preferences.addSetting({
@@ -1931,6 +1932,10 @@ if (SECURITY_PRIVACY_STATUS_CARD_ENABLED) {
    deps: SECURITY_WARNINGS.map(warning => warning.id),
    _telemetrySent: false,
    visible(deps) {
      // Hide the privacy card's warnings. tor-browser#44829.
      if (lazy.AppConstants.BASE_BROWSER_VERSION) {
        return false;
      }
      const count = Object.values(deps).filter(
        depSetting => depSetting.visible
      ).length;
@@ -2206,6 +2211,10 @@ Preferences.addSetting({
  pref: "privacy.globalprivacycontrol.enabled",
  deps: ["gpcFunctionalityEnabled"],
  visible: ({ gpcFunctionalityEnabled }) => {
    // Hide GPC. tor-browser#42777.
    if (lazy.AppConstants.BASE_BROWSER_VERSION) {
      return false;
    }
    return gpcFunctionalityEnabled.value;
  },
});
+4 −0
Original line number Diff line number Diff line
@@ -541,10 +541,14 @@ Preferences.addSetting({
Preferences.addSetting({
  id: "cfrRecommendations",
  pref: "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons",
  // Hide feature recommendation (CFR). tor-browser#43118.
  visible: () => false,
});
Preferences.addSetting({
  id: "cfrRecommendations-features",
  pref: "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features",
  // Hide feature recommendation (CFR). tor-browser#43118.
  visible: () => false,
});

SettingGroupManager.registerGroups({
Loading