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

chrome/browser/resources/settings/privacy_page/privacy_page.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.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-button/paper-button.html">
 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog.html">
 <link rel="import" href="/controls/settings_checkbox.html">
 <link rel="import" href="/route.html">
 <link rel="import" href="/settings_page/settings_animated_pages.html">
 <link rel="import" href="/settings_page/settings_subpage.html">
 <link rel="import" href="/settings_shared_css.html">
@@ skipping 74 matching lines @@
           </settings-checkbox>
 </if>
         </div>
 <if expr="use_nss_certs or is_win or is_macosx">
         <div id="manageCertificates" class="settings-box two-line single-column"
             actionable on-tap="onManageCertificatesTap_">
           <div>$i18n{manageCertificates}</div>
           <div class="secondary">$i18n{manageCertificatesDescription}</div>
         </div>
 </if>
-        <div class="settings-box two-line single-column" actionable
+        <div id="site-settings-subpage-trigger"
+            class="settings-box two-line single-column" actionable
             on-tap="onSiteSettingsTap_">
           <div>$i18n{siteSettings}</div>
           <div class="secondary">$i18n{siteSettingsDescription}</div>
         </div>
         <div class="settings-box">
           <paper-button on-tap="onClearBrowsingDataTap_" class="primary-button">
             $i18n{clearBrowsingData}
           </paper-button>
         </div>
       </neon-animatable>
 <if expr="use_nss_certs">
       <template is="dom-if" name="manage-certificates">
-        <settings-subpage page-title="$i18n{manageCertificates}">
+        <settings-subpage
+            associated-control="[[$$('#manageCertificates')]]"
+            page-title="$i18n{manageCertificates}">
           <settings-certificate-manager-page>
           </settings-certificate-manager-page>
         </settings-subpage>
       </template>
 </if>
       <template is="dom-if" name="site-settings">
-        <settings-subpage id="site-settings"
+        <settings-subpage
+            associated-control="[[$$('#site-settings-subpage-trigger')]]"
+            id="site-settings"
             page-title="$i18n{siteSettings}">
           <settings-site-settings-page current-route="{{currentRoute}}"
               category-selected="{{categorySelected}}">
           </settings-site-settings-page>
         </settings-subpage>
       </template>
 
       <template is="dom-if" name="all-sites">
-        <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{siteSettingsCategoryAllSites}">
           <all-sites
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}">
           </all-sites>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-automatic-downloads">
-        <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{siteSettingsAutomaticDownloads}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}">
           </site-settings-category>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-background-sync">
-        <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{siteSettingsBackgroundSync}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.BACKGROUND_SYNC}}">
           </site-settings-category>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-camera">
-        <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{siteSettingsCategoryCamera}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.CAMERA}}">
             <media-picker type="camera" class="media-picker"></media-picker>
           </site-settings-category>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-cookies">
-        <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{siteSettingsCategoryCookies}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.COOKIES}}">
             <div class="settings-box cookie-controls">
               <settings-checkbox class="start"
                   label="$i18n{thirdPartyCookie}"
                   sub-label="$i18n{thirdPartyCookieSublabel}"
                   pref="{{prefs.profile.block_third_party_cookies}}">
               </settings-checkbox>
             </div>
             <site-data class="site-data"></site-data>
           </site-settings-category>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-images">
-        <settings-subpage page-title="$i18n{siteSettingsCategoryImages}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{siteSettingsCategoryImages}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.IMAGES}}">
           </site-settings-category>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-location">
-        <settings-subpage page-title="$i18n{siteSettingsCategoryLocation}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{siteSettingsCategoryLocation}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.GEOLOCATION}}">
           </site-settings-category>
         </settings-subpage>
       </template>
       <template is="dom-if" name="protocol-handlers">
-        <settings-subpage page-title="$i18n{siteSettingsCategoryHandlers}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{siteSettingsCategoryHandlers}">
           <protocol-handlers></protocol-handlers>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-javascript">
-        <settings-subpage
+        <settings-subpage no-associated-control
             page-title="$i18n{siteSettingsCategoryJavascript}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.JAVASCRIPT}}">
           </site-settings-category>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-keygen">
-        <settings-subpage page-title="$i18n{siteSettingsKeygen}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{siteSettingsKeygen}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.KEYGEN}}">
           </site-settings-category>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-microphone">
-        <settings-subpage
+        <settings-subpage no-associated-control
             page-title="$i18n{siteSettingsCategoryMicrophone}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.MIC}}">
             <media-picker type="mic" class="media-picker"></media-picker>
           </site-settings-category>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-notifications">
-        <settings-subpage
+        <settings-subpage no-associated-control
             page-title="$i18n{siteSettingsCategoryNotifications}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.NOTIFICATIONS}}">
           </site-settings-category>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-plugins">
-        <settings-subpage page-title="$i18n{siteSettingsPlugins}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{siteSettingsPlugins}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.PLUGINS}}">
           </site-settings-category>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-popups">
-        <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{siteSettingsCategoryPopups}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.POPUPS}}">
           </site-settings-category>
         </settings-subpage>
       </template>
       <template is="dom-if" name="site-settings-category-unsandboxed-plugins">
-        <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}">
+        <settings-subpage no-associated-control
+            page-title="$i18n{siteSettingsUnsandboxedPlugins}">
           <site-settings-category
               selected-site="{{selectedSite}}"
               current-route="{{currentRoute}}"
               category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">
           </site-settings-category>
         </settings-subpage>
       </template>
 
       <template is="dom-if" name="site-details">
-        <settings-subpage
+        <settings-subpage no-associated-control
             page-title="[[selectedSite.originForDisplay]]">
           <site-details site="[[selectedSite]]"></site-details>
         </settings-subpage>
       </template>
     </settings-animated-pages>
   </template>
   <script src="privacy_page.js"></script>
 </dom-module>