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/preferences.js
    ... ... @@ -246,6 +246,7 @@ const CONFIG_PANES = Object.freeze({
    246 246
         groupIds: ["dnsOverHttpsAdvanced"],
    
    247 247
       },
    
    248 248
       managePayments: {
    
    249
    +    skip: true,
    
    249 250
         parent: "privacy",
    
    250 251
         l10nId: "autofill-payment-methods-manage-payments-title",
    
    251 252
         groupIds: ["managePayments"],
    
    ... ... @@ -256,6 +257,7 @@ const CONFIG_PANES = Object.freeze({
    256 257
         groupIds: ["profilePane"],
    
    257 258
       },
    
    258 259
       etp: {
    
    260
    +    skip: true, // Skip enhanced tracking protection. tor-browser#33848.
    
    259 261
         parent: "privacy",
    
    260 262
         l10nId: "preferences-etp-header",
    
    261 263
         groupIds: ["etpBanner", "etpAdvanced"],
    
    ... ... @@ -266,11 +268,13 @@ const CONFIG_PANES = Object.freeze({
    266 268
         groupIds: ["etpReset", "etpCustomize"],
    
    267 269
       },
    
    268 270
       manageAddresses: {
    
    271
    +    skip: true,
    
    269 272
         parent: "privacy",
    
    270 273
         l10nId: "autofill-addresses-manage-addresses-title",
    
    271 274
         groupIds: ["manageAddresses"],
    
    272 275
       },
    
    273 276
       translations: {
    
    277
    +    skip: true, // Skip translations. tor-browser#44710.
    
    274 278
         parent: "general",
    
    275 279
         l10nId: "settings-translations-subpage-header",
    
    276 280
         groupIds: [
    
    ... ... @@ -280,6 +284,7 @@ const CONFIG_PANES = Object.freeze({
    280 284
         iconSrc: "chrome://browser/skin/translations.svg",
    
    281 285
       },
    
    282 286
       aiFeatures: {
    
    287
    +    skip: true, // Skip AI pane. tor-browser#44709.
    
    283 288
         l10nId: "preferences-ai-features-header",
    
    284 289
         groupIds: ["debugModelManagement", "aiFeatures", "aiWindowFeatures"],
    
    285 290
         module: "chrome://browser/content/preferences/config/aiFeatures.mjs",
    
    ... ... @@ -345,6 +350,22 @@ function init_all() {
    345 350
       register_module("paneContainers", gContainersPane);
    
    346 351
     
    
    347 352
       for (let [id, config] of Object.entries(CONFIG_PANES)) {
    
    353
    +    // Skip over configs we do not want, including all its children.
    
    354
    +    // See tor-browser#44711.
    
    355
    +    let skip = false;
    
    356
    +    let parentConfig = config;
    
    357
    +    while (parentConfig) {
    
    358
    +      skip = parentConfig.skip;
    
    359
    +      if (skip) {
    
    360
    +        break;
    
    361
    +      }
    
    362
    +      parentConfig = parentConfig.parent
    
    363
    +        ? CONFIG_PANES[parentConfig.parent]
    
    364
    +        : undefined;
    
    365
    +    }
    
    366
    +    if (skip) {
    
    367
    +      continue;
    
    368
    +    }
    
    348 369
         SettingPaneManager.registerPane(id, config);
    
    349 370
       }
    
    350 371
     
    

  • browser/components/preferences/preferences.xhtml
    ... ... @@ -172,8 +172,12 @@
    172 172
               <label class="category-name" flex="1" data-l10n-id="pane-sync-title3"></label>
    
    173 173
             </richlistitem>
    
    174 174
     
    
    175
    +        <!-- We skip registering the "ai" pane (aiFeatures.mjs), which means
    
    176
    +           - this richlistitem is non-functional and unmanaged. We have to
    
    177
    +           - manually hide it instead. See tor-browser#44709. -->
    
    175 178
             <richlistitem id="category-ai-features"
    
    176 179
                           class="category"
    
    180
    +                      hidden="true"
    
    177 181
                           value="paneAiFeatures"
    
    178 182
                           data-l10n-id="category-ai-features"
    
    179 183
                           data-l10n-attrs="tooltiptext"
    
    ... ... @@ -219,7 +223,9 @@
    219 223
                           class="category hidden-category"
    
    220 224
                           value="paneProfiles"/>
    
    221 225
     
    
    226
    +        <!-- Hide the translations sub-pane. tor-browser#44710. -->
    
    222 227
             <richlistitem
    
    228
    +                      hidden="true"
    
    223 229
                           class="category hidden-category"
    
    224 230
                           value="paneTranslations"/>
    
    225 231