Bug 1362571 - Move 'Saved Logins' button under the remember logins checkbox. r=jaws

MozReview-Commit-ID: 9TDKQXnvUlb

--HG--
extra : rebase_source : 26cc209d55f91ed90b2d2f7ea126752a493bc09c

browser/components/preferences/in-content-old/security.xul

@@ -92,33 +92,21 @@
 <groupbox id="passwordsGroup" orient="vertical" data-category="paneSecurity" hidden="true">
   <caption><label>&logins.label;</label></caption>
 
-  <hbox id="savePasswordsBox">
-    <checkbox id="savePasswords"
-              label="&rememberLogins.label;" accesskey="&rememberLogins.accesskey;"
-              preference="signon.rememberSignons"
-              onsyncfrompreference="return gSecurityPane.readSavePasswords();"/>
-    <spacer flex="1"/>
-    <button id="passwordExceptions"
-            label="&passwordExceptions.label;"
-            accesskey="&passwordExceptions.accesskey;"
-            preference="pref.privacy.disable_button.view_passwords_exceptions"/>
-  </hbox>
   <grid id="passwordGrid">
     <columns>
       <column flex="1"/>
       <column/>
     </columns>
     <rows id="passwordRows">
-      <row id="masterPasswordRow">
-        <hbox id="masterPasswordBox">
-          <checkbox id="useMasterPassword"
-                    label="&useMasterPassword.label;"
-                    accesskey="&useMasterPassword.accesskey;"/>
-          <spacer flex="1"/>
-        </hbox>
-        <button id="changeMasterPassword"
-                label="&changeMasterPassword.label;"
-                accesskey="&changeMasterPassword.accesskey;"/>
+      <row id="savePasswordsBox">
+        <checkbox id="savePasswords"
+                  label="&rememberLogins.label;" accesskey="&rememberLogins.accesskey;"
+                  preference="signon.rememberSignons"
+                  onsyncfrompreference="return gSecurityPane.readSavePasswords();"/>
+        <button id="passwordExceptions"
+                label="&passwordExceptions.label;"
+                accesskey="&passwordExceptions.accesskey;"
+                preference="pref.privacy.disable_button.view_passwords_exceptions"/>
       </row>
       <row id="showPasswordRow">
         <hbox id="showPasswordsBox"/>
@@ -128,4 +116,13 @@
       </row>
     </rows>
   </grid>
+  <hbox id="masterPasswordRow">
+    <checkbox id="useMasterPassword"
+              label="&useMasterPassword.label;"
+              accesskey="&useMasterPassword.accesskey;"/>
+    <spacer flex="1"/>
+    <button id="changeMasterPassword"
+            label="&changeMasterPassword.label;"
+            accesskey="&changeMasterPassword.accesskey;"/>
+  </hbox>
 </groupbox>

browser/components/preferences/in-content/privacy.xul

@@ -306,35 +306,23 @@
 <groupbox id="passwordsGroup" orient="vertical" data-category="panePrivacy" hidden="true">
   <caption><label>&formsAndPasswords.label;</label></caption>
 
-  <hbox id="savePasswordsBox">
-    <checkbox id="savePasswords"
-              label="&rememberLogins1.label;" accesskey="&rememberLogins1.accesskey;"
-              preference="signon.rememberSignons"
-              onsyncfrompreference="return gPrivacyPane.readSavePasswords();"
-              flex="1" />
-    <button id="passwordExceptions"
-            class="accessory-button"
-            label="&passwordExceptions.label;"
-            accesskey="&passwordExceptions.accesskey;"
-            preference="pref.privacy.disable_button.view_passwords_exceptions"/>
-  </hbox>
   <grid id="passwordGrid">
     <columns>
       <column flex="1"/>
       <column/>
     </columns>
     <rows id="passwordRows">
-      <row id="masterPasswordRow">
-        <hbox id="masterPasswordBox">
-          <checkbox id="useMasterPassword"
-                    label="&useMasterPassword.label;"
-                    accesskey="&useMasterPassword.accesskey;"
-                    flex="1" />
-        </hbox>
-        <button id="changeMasterPassword"
+      <row id="savePasswordsBox">
+        <checkbox id="savePasswords"
+                  label="&rememberLogins1.label;" accesskey="&rememberLogins1.accesskey;"
+                  preference="signon.rememberSignons"
+                  onsyncfrompreference="return gPrivacyPane.readSavePasswords();"
+                  flex="1" />
+        <button id="passwordExceptions"
                 class="accessory-button"
-                label="&changeMasterPassword.label;"
-                accesskey="&changeMasterPassword.accesskey;"/>
+                label="&passwordExceptions.label;"
+                accesskey="&passwordExceptions.accesskey;"
+                preference="pref.privacy.disable_button.view_passwords_exceptions"/>
       </row>
       <row id="showPasswordRow">
         <hbox id="showPasswordsBox"/>
@@ -345,6 +333,16 @@
       </row>
     </rows>
   </grid>
+  <hbox id="masterPasswordRow">
+    <checkbox id="useMasterPassword"
+              label="&useMasterPassword.label;"
+              accesskey="&useMasterPassword.accesskey;"
+              flex="1" />
+    <button id="changeMasterPassword"
+            class="accessory-button"
+            label="&changeMasterPassword.label;"
+            accesskey="&changeMasterPassword.accesskey;"/>
+  </hbox>
 </groupbox>
 
 <!-- Tracking -->

browser/extensions/formautofill/FormAutofillParent.jsm

@@ -104,7 +104,7 @@ FormAutofillParent.prototype = {
                          document.getElementById("passwordsGroup");
         let insertBeforeNode = useOldOrganization ?
                                document.getElementById("locationBarGroup") :
-                               document.getElementById("passwordGrid");
+                               document.getElementById("masterPasswordRow");
         parentNode.insertBefore(prefGroup, insertBeforeNode);
         break;
       }