tor-browser

commit 1ebd20dd1cf0af009121e2bb47dd8eee65aebb30
parent 8c22be6bad0c3176f55684dc1f542973d52efda8
Author: Micah Killoran <mtigley@mozilla.com>
Date:   Thu, 18 Dec 2025 22:36:08 +0000

Bug 2006066 - Move payments and addresses sections into separate groupboxes. r=dimi,omc-reviewers,emcminn

Differential Revision: https://phabricator.services.mozilla.com/D276687

Diffstat:
M
browser/components/asrouter/tests/browser/browser_trigger_listeners.js
 | 
2
+-
M
browser/components/preferences/privacy.inc.xhtml
 | 
9
++++++---
M
browser/components/preferences/tests/browser_search_subdialog_tooltip_saved_addresses.js
 | 
5
+----
M
browser/extensions/formautofill/test/browser/creditCard/browser_creditCard_osAuth.js
 | 
6
++----
M
toolkit/components/formautofill/FormAutofillPreferences.sys.mjs
 | 
20
--------------------

5 files changed, 10 insertions(+), 32 deletions(-)
diff --git a/browser/components/asrouter/tests/browser/browser_trigger_listeners.js b/browser/components/asrouter/tests/browser/browser_trigger_listeners.js
@@ -89,7 +89,7 @@ async function test_formAutofillTrigger(settingsRedesignEnabled) {
             await ContentTaskUtils.waitForCondition(
               () =>
                 content.document.querySelector(
-                  "#formAutofillGroupBox setting-group[groupid=payments] #savedPaymentsButton"
+                  "setting-group[groupid=payments] #savedPaymentsButton"
                 ),
               "Waiting for credit card manager button"
             )
diff --git a/browser/components/preferences/privacy.inc.xhtml b/browser/components/preferences/privacy.inc.xhtml
@@ -558,13 +558,16 @@
 
 <html:setting-group groupid="passwords" hidden="true" data-category="panePrivacy" />
 
-<!-- The form autofill section is inserted in to this box
-     after the form autofill extension has initialized. -->
-<groupbox id="formAutofillGroupBox"
+<groupbox id="paymentsGroupBox"
           data-category="panePrivacy"
           data-subcategory="form-autofill" hidden="true">
   <label><html:h2 data-l10n-id="autofill-payment-methods-title" class="subsection-heading"/></label>
   <html:setting-group data-subcategory="credit-card-autofill" groupid="payments"/>
+</groupbox>
+
+<groupbox id="addressesGroupBox"
+          data-category="panePrivacy"
+          data-subcategory="form-autofill" hidden="true">
   <label><html:h2 data-l10n-id="autofill-addresses-title" class="subsection-heading"/></label>
   <html:setting-group data-subcategory="address-autofill" groupid="addresses"/>
 </groupbox>
diff --git a/browser/components/preferences/tests/browser_search_subdialog_tooltip_saved_addresses.js b/browser/components/preferences/tests/browser_search_subdialog_tooltip_saved_addresses.js
@@ -8,10 +8,7 @@ add_task(async function test_show_search_term_tooltip_in_subdialog() {
   let keyword = "organization";
   await runSearchInput(keyword);
 
-  let formAutofillGroupBox = gBrowser.contentDocument.getElementById(
-    "formAutofillGroupBox"
-  );
-  let addressesGroup = formAutofillGroupBox.querySelector(
+  let addressesGroup = gBrowser.contentDocument.querySelector(
     "setting-group[groupid=addresses]"
   );
   let savedAddressesButton = addressesGroup.querySelector(
diff --git a/browser/extensions/formautofill/test/browser/creditCard/browser_creditCard_osAuth.js b/browser/extensions/formautofill/test/browser/creditCard/browser_creditCard_osAuth.js
@@ -3,10 +3,8 @@
 const PAGE_PREFS = "about:preferences";
 const PAGE_PRIVACY = PAGE_PREFS + "#privacy";
 const SELECTORS = {
-  savedCreditCardsBtn:
-    "#formAutofillGroupBox setting-group[groupid=payments] #savedPaymentsButton",
-  reauthCheckbox:
-    "#formAutofillGroupBox setting-group[groupid=payments] #requireOSAuthForPayments",
+  savedCreditCardsBtn: "setting-group[groupid=payments] #savedPaymentsButton",
+  reauthCheckbox: "setting-group[groupid=payments] #requireOSAuthForPayments",
 };
 
 // On mac, this test times out in chaos mode
diff --git a/toolkit/components/formautofill/FormAutofillPreferences.sys.mjs b/toolkit/components/formautofill/FormAutofillPreferences.sys.mjs
@@ -91,14 +91,6 @@ export class FormAutofillPreferences {
    */
   init(document) {
     this.createPreferenceGroup(document);
-    return this.refs.formAutofillFragment;
-  }
-
-  /**
-   * Remove event listeners and the preference group.
-   */
-  uninit() {
-    this.refs.formAutofillGroup.remove();
   }
 
   /**
@@ -108,18 +100,6 @@ export class FormAutofillPreferences {
    */
   createPreferenceGroup(document) {
     const win = document.ownerGlobal;
-    this.refs = {};
-    this.refs.formAutofillGroup = document.querySelector(
-      "#formAutofillGroupBox"
-    );
-
-    let showAddressUI = FormAutofill.isAutofillAddressesAvailable;
-    let showCreditCardUI = FormAutofill.isAutofillCreditCardsAvailable;
-
-    if (!showAddressUI && !showCreditCardUI) {
-      return;
-    }
-
     win.Preferences.addAll([
       // Credit cards and addresses
       { id: ENABLED_AUTOFILL_ADDRESSES_PREF, type: "bool" },