| 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 a949532cf0e37fac3c642149b50d4704cbe37248..ab905898dc9e4d12b0fed69bd3ff5ac8075ecfc3 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 | 
| @@ -4,6 +4,7 @@ | 
| <link rel="import" href="chrome://resources/html/polymer.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/autofill_section.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"> | 
| @@ -16,12 +17,12 @@ | 
| <settings-animated-pages id="pages" current-route="{{currentRoute}}" | 
| section="passwordsAndForms"> | 
| <neon-animatable id="main"> | 
| -        <div class="settings-box first two-line"> | 
| +        <div class="settings-box first two-line" on-tap="onAutofillTap_"> | 
| <div class="start"> | 
| <div>[[i18n('autofill')]]</div> | 
| <div class="secondary">[[i18n('autofillDetail')]]</div> | 
| </div> | 
| -          <paper-toggle-button | 
| +          <paper-toggle-button id="autofillToggle" | 
| checked="{{prefs.autofill.enabled.value}}"> | 
| </paper-toggle-button> | 
| </div> | 
| @@ -35,6 +36,12 @@ | 
| </paper-toggle-button> | 
| </div> | 
| </neon-animatable> | 
| +      <template is="dom-if" name="manage-autofill"> | 
| +        <settings-subpage page-title="[[i18n('autofill')]]"> | 
| +          <settings-autofill-section id="autofillSection"> | 
| +          </settings-autofill-section> | 
| +        </settings-subpage> | 
| +      </template> | 
| <template is="dom-if" name="manage-passwords"> | 
| <settings-subpage page-title="[[i18n('passwords')]]"> | 
| <passwords-section saved-passwords="[[savedPasswords]]" | 
|  |