henry pushed to branch mullvad-browser-148.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser

Commits:

2 changed files:

Changes:

  • browser/components/preferences/main.js
    ... ... @@ -1910,9 +1910,37 @@ Preferences.addSetting({
    1910 1910
     Preferences.addSetting({
    
    1911 1911
       id: "contrastControlSettings",
    
    1912 1912
       pref: "browser.display.document_color_use",
    
    1913
    +  // Modify the contrast setting options when resist fingerprinting (RFP) is
    
    1914
    +  // enabled because the custom colours will not be used in this state.
    
    1915
    +  // Instead, some fixed set of stand-in colours is used. tor-browser#43850.
    
    1916
    +  deps: ["resistFingerprinting"],
    
    1917
    +  getControlConfig(config, { resistFingerprinting }, setting) {
    
    1918
    +    if (resistFingerprinting.value) {
    
    1919
    +      // Hide the "Automatic" option under RFP if it is not already
    
    1920
    +      // selected. We generally want to discourage this reflection of system
    
    1921
    +      // settings if RFP is enabled.
    
    1922
    +      // NOTE: It would be unexpected for this value to be selected under
    
    1923
    +      // RFP since there is no visible UI to do so in this state. It would
    
    1924
    +      // likely require some direct preference manipulation.
    
    1925
    +      config.options[0].hidden = setting.value != config.options[0].value;
    
    1926
    +      // Show the last option as "fixed colors".
    
    1927
    +      config.options[2].l10nId = "preferences-contrast-control-fixed-color2";
    
    1928
    +    } else {
    
    1929
    +      // Set back to the default config.
    
    1930
    +      config.options[0].hidden = false;
    
    1931
    +      config.options[2].l10nId = "preferences-contrast-control-custom";
    
    1932
    +    }
    
    1933
    +    return config;
    
    1934
    +  },
    
    1913 1935
     });
    
    1914 1936
     Preferences.addSetting({
    
    1915 1937
       id: "colors",
    
    1938
    +  // Hide the "colors" button and dialog when resist fingerprint (RFP) is
    
    1939
    +  // enabled because the custom colours will not be used. tor-browser#43850.
    
    1940
    +  deps: ["resistFingerprinting"],
    
    1941
    +  visible: ({ resistFingerprinting }) => {
    
    1942
    +    return !resistFingerprinting.value;
    
    1943
    +  },
    
    1916 1944
       onUserClick() {
    
    1917 1945
         gSubDialog.open(
    
    1918 1946
           "chrome://browser/content/preferences/dialogs/colors.xhtml",
    

  • toolkit/locales/en-US/toolkit/global/base-browser.ftl
    ... ... @@ -108,10 +108,10 @@ browser-layout-show-sidebar-desc-limited = Quickly access bookmarks and more wit
    108 108
     
    
    109 109
     ## Preferences - Contrast Control.
    
    110 110
     
    
    111
    -preferences-contrast-control-fixed-color =
    
    111
    +preferences-contrast-control-fixed-color2 =
    
    112 112
         .label = Fixed colors
    
    113 113
         .accesskey = F
    
    114
    -preferences-contrast-control-fixed-color-description = This will be detectable by websites and will make you appear more unique to web trackers.
    
    114
    +    .description = This will be detectable by websites and will make you appear more unique to web trackers.
    
    115 115
     
    
    116 116
     ## Security level toolbar button.
    
    117 117
     ## Uses sentence case in English (US).