Move passwords and password exceptions list into a sub page.

chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.html

Index: chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.html
diff --git a/chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.html b/chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.html
index 39bb6f815ebd42affd3ce555c0e8a1a32891eb73..4526351c4e77ca41a9998c1e31bf8bf5624b1c0a 100644
--- a/chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.html
+++ b/chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.html
@@ -1,45 +1,50 @@
 <link rel="import" href="chrome://resources/html/assert.html">
 <link rel="import" href="chrome://resources/html/cr.html">
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
 <link rel="import" href="chrome://md-settings/passwords_and_forms_page/passwords_section.html">
+<link rel="import" href="chrome://md-settings/prefs/prefs_behavior.html">
+<link rel="import" href="chrome://md-settings/settings_page/settings_animated_pages.html">
+<link rel="import" href="chrome://md-settings/settings_page/settings_subheader.html">
 <link rel="import" href="chrome://md-settings/settings_shared_css.html">
 
 <dom-module id="settings-passwords-and-forms-page">
   <template>
     <style include="settings-shared"></style>
-    <div class="settings-box first two-line">
-      <div class="start">
-        <div i18n-content="autofill"></div>
-        <div class="secondary" i18n-content="autofillDetail"></div>
-      </div>
-      <paper-toggle-button
-          checked="{{prefs.autofill.enabled.value}}">
-      </paper-toggle-button>
-      <cr-expand-button disabled="[[!prefs.autofill.enabled.value]]">
-      </cr-expand-button>
-    </div>
-    <div class="settings-box two-line">
-      <div class="start">
-        <div i18n-content="passwords"></div>
-        <div class="secondary" i18n-content="passwordsDetail"></div>
-      </div>
-      <paper-toggle-button
-          checked="{{prefs.profile.password_manager_enabled.value}}">
-      </paper-toggle-button>
-      <cr-expand-button expanded="{{passwordsOpened}}"
-          disabled="[[!prefs.profile.password_manager_enabled.value]]">
-      </cr-expand-button>
-    </div>
-    <iron-collapse id="collapse" opened="[[passwordsOpened]]">
-    <passwords-section saved-passwords="[[savedPasswords]]"
-        password-exceptions="[[passwordExceptions]]"
-        show-passwords=
-            "[[prefs.profile.password_manager_allow_show_passwords.value]]">
-    </passwords-section>
-    </iron-collapse>
+    <settings-animated-pages id="pages" current-route="{{currentRoute}}"
+        section="passwordsAndForms">
+      <neon-animatable id="main">
+        <div class="settings-box first two-line">
+          <div class="start">
+            <div>[[i18n('autofill')]]</div>
+            <div class="secondary">[[i18n('autofillDetail')]]</div>
+          </div>
+          <paper-toggle-button
+              checked="{{prefs.autofill.enabled.value}}">
+          </paper-toggle-button>
+        </div>
+        <div class="settings-box two-line" on-tap="onPasswordsTap_">
+          <div class="start">
+            <div>[[i18n('passwords')]]</div>
+            <div class="secondary">[[i18n('passwordsDetail')]]</div>
+          </div>
+          <paper-toggle-button id="passwordToggle"
+              checked="{{prefs.profile.password_manager_enabled.value}}">
+          </paper-toggle-button>
+        </div>
+      </neon-animatable>
+      <neon-animatable id="manage-passwords">
+        <settings-subheader page-title="[[i18n('passwords')]]">
+        </settings-subheader>
+        <passwords-section saved-passwords="[[savedPasswords]]"
+            password-exceptions="[[passwordExceptions]]"
+            show-passwords=
+                "[[prefs.profile.password_manager_allow_show_passwords.value]]">
+        </passwords-section>
+      </neon-animatable>
+    </settings-animated-pages>
   </template>
   <script src="passwords_and_forms_page.js"></script>
 </dom-module>