Bug 1362583 - [Form Autofill] Move autofill preferences before master password ones. r=scottwu draft
authorMatthew Noorenberghe <mozilla@noorenberghe.ca>
Fri, 05 May 2017 15:24:10 -0700
changeset 573529 b44724e5a7ae77ee2d2053c052895db176bcc7db
parent 573527 fb6f0744e02797d5322f7458c84a55004a849597
child 573572 2c932f86f864b2a4a91666191af70a51f1c86ba3
push id57417
push usermozilla@noorenberghe.ca
push dateFri, 05 May 2017 22:24:22 +0000
reviewersscottwu
bugs1362583
milestone55.0a1
Bug 1362583 - [Form Autofill] Move autofill preferences before master password ones. r=scottwu MozReview-Commit-ID: 9sLFeAgXmpT
browser/extensions/formautofill/FormAutofillParent.jsm
browser/extensions/formautofill/FormAutofillPreferences.jsm
--- a/browser/extensions/formautofill/FormAutofillParent.jsm
+++ b/browser/extensions/formautofill/FormAutofillParent.jsm
@@ -99,17 +99,17 @@ FormAutofillParent.prototype = {
         let formAutofillPreferences = new FormAutofillPreferences({useOldOrganization});
         let document = subject.document;
         let prefGroup = formAutofillPreferences.init(document);
         let parentNode = useOldOrganization ?
                          document.getElementById("mainPrefPane") :
                          document.getElementById("passwordsGroup");
         let insertBeforeNode = useOldOrganization ?
                                document.getElementById("locationBarGroup") :
-                               null;
+                               document.getElementById("masterPasswordRow");
         parentNode.insertBefore(prefGroup, insertBeforeNode);
         break;
       }
 
       case "nsPref:changed": {
         // Observe pref changes and update _enabled cache if status is changed.
         let currentStatus = this._getStatus();
         if (currentStatus !== this._enabled) {
--- a/browser/extensions/formautofill/FormAutofillPreferences.jsm
+++ b/browser/extensions/formautofill/FormAutofillPreferences.jsm
@@ -79,16 +79,17 @@ FormAutofillPreferences.prototype = {
       formAutofillGroup.hidden = document.location.href != "about:preferences#privacy";
       // Use .setAttribute because HTMLElement.dataset is not available on XUL elements
       formAutofillGroup.setAttribute("data-category", "panePrivacy");
       formAutofillGroup.appendChild(caption);
       caption.appendChild(captionLabel);
       captionLabel.textContent = this.bundle.GetStringFromName("preferenceGroupTitle");
     } else {
       formAutofillGroup = document.createElementNS(XUL_NS, "vbox");
+      savedProfilesBtn.className = "accessory-button";
     }
 
     this.refs = {
       formAutofillGroup,
       profileAutofillCheckbox,
       savedProfilesBtn,
     };