MD Settings: Associate suppages with the controls that trigger them.

chrome/browser/resources/settings/people_page/people_page.html

Index: chrome/browser/resources/settings/people_page/people_page.html
diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html
index 64989d344c4b63a5a37435d91cb032bbd5625860..21a121bd091f6d431b5c35b5be53dec4d9e9eba5 100644
--- a/chrome/browser/resources/settings/people_page/people_page.html
+++ b/chrome/browser/resources/settings/people_page/people_page.html
@@ -75,7 +75,7 @@
     <settings-animated-pages id="pages" current-route="{{currentRoute}}"
         section="people">
       <neon-animatable id="main">
-        <div class="settings-box first two-line">
+        <div id="picture-subpage-trigger" class="settings-box first two-line">
           <img id="profile-icon" src="[[profileIconUrl_]]"
               on-tap="onPictureTap_" actionable>
           <div class="middle">
@@ -170,7 +170,7 @@
         <!-- TODO(jdufault): Disable navigating to /quickUnlock/* if pin is
           disabled. -->
         <template is="dom-if" if=[[quickUnlockEnabled_]]>
-          <div class="settings-box">
+          <div id="quick-unlock-subpage-trigger" class="settings-box">
             <paper-button on-tap="onQuickUnlockTap_" class="primary-button">
               $i18n{quickUnlockTitle}
             </paper-button>
@@ -220,7 +220,7 @@
         </template>
 </if>
 
-        <div class="settings-box">
+        <div id="manage-other-people-subpage-trigger" class="settings-box">
           <paper-button class="primary-button" on-tap="onManageOtherPeople_">
             $i18n{manageOtherPeople}
           </paper-button>
@@ -236,14 +236,18 @@
         </template>
       </neon-animatable>
       <template is="dom-if" name="sync">
-        <settings-subpage page-title="$i18n{syncPageTitle}">
+        <settings-subpage
+            associated-control="[[$$('#customize-sync')]]"
+            page-title="$i18n{syncPageTitle}">
           <settings-sync-page current-route="[[currentRoute]]">
           </settings-sync-page>
         </settings-subpage>
       </template>
 <if expr="chromeos">
       <template is="dom-if" name="quick-unlock-authenticate">
-        <settings-subpage page-title="$i18n{quickUnlockTitle}">
+        <settings-subpage
+            associated-control="[[$$('#quick-unlock-subpage-trigger')]]"
+            page-title="$i18n{quickUnlockTitle}">
           <settings-quick-unlock-authenticate
             set-modes="{{quickUnlockSetModes}}"
             current-route="{{currentRoute}}"
@@ -252,7 +256,8 @@
         </settings-subpage>
       </template>
       <template is="dom-if" name="quick-unlock-choose-method">
-        <settings-subpage page-title="$i18n{quickUnlockTitle}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{quickUnlockTitle}">
           <settings-quick-unlock-choose-method
             set-modes="[[quickUnlockSetModes]]"
             current-route="{{currentRoute}}"
@@ -261,7 +266,8 @@
         </settings-subpage>
       </template>
       <template is="dom-if" name="quick-unlock-setup-pin">
-        <settings-subpage page-title="$i18n{quickUnlockTitle}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{quickUnlockTitle}">
           <settings-quick-unlock-setup-pin
             set-modes="[[quickUnlockSetModes]]"
             current-route="{{currentRoute}}">
@@ -269,19 +275,25 @@
         </settings-subpage>
       </template>
       <template is="dom-if" name="users">
-        <settings-subpage page-title="$i18n{usersPageTitle}">
+        <settings-subpage
+            associated-control="[[$$('#manage-other-people-subpage-trigger')]]"
+            page-title="$i18n{usersPageTitle}">
           <settings-users-page prefs="{{prefs}}"></settings-users-page>
         </settings-subpage>
       </template>
       <template is="dom-if" name="changePicture">
-        <settings-subpage page-title="$i18n{changePictureTitle}">
+        <settings-subpage
+          associated-control="[[$$('#picture-subpage-trigger')]]"
+          page-title="$i18n{changePictureTitle}">
           <settings-change-picture></settings-change-picture>
         </settings-subpage>
       </template>
 </if>
 <if expr="not chromeos">
       <template is="dom-if" name="manageProfile">
-        <settings-subpage page-title="$i18n{editPerson}">
+        <settings-subpage
+            associated-control="[[$$('#picture-subpage-trigger')]]"
+            page-title="$i18n{editPerson}">
           <settings-manage-profile profile-icon-url="[[profileIconUrl_]]"
               profile-name="[[profileName_]]">
           </settings-manage-profile>