Chromium Code Reviews| Index: chrome/browser/resources/settings/advanced_page/advanced_page.html |
| diff --git a/chrome/browser/resources/settings/advanced_page/advanced_page.html b/chrome/browser/resources/settings/advanced_page/advanced_page.html |
| index d57aa53f4d862a3b9da4f75b224f6b092d77097d..e5b769ebfef2747459f69de80b6362421f6b581a 100644 |
| --- a/chrome/browser/resources/settings/advanced_page/advanced_page.html |
| +++ b/chrome/browser/resources/settings/advanced_page/advanced_page.html |
| @@ -4,6 +4,7 @@ |
| <link rel="import" href="chrome://md-settings/passwords_and_forms_page/passwords_and_forms_page.html"> |
| <link rel="import" href="chrome://md-settings/privacy_page/privacy_page.html"> |
| <link rel="import" href="chrome://md-settings/reset_page/reset_page.html"> |
| +<link rel="import" href="chrome://md-settings/settings_page/settings_page_visibility.html"> |
| <link rel="import" href="chrome://md-settings/settings_page/settings_section.html"> |
| <link rel="import" href="chrome://md-settings/site_settings/constants.html"> |
| <link rel="import" href="chrome://md-settings/site_settings/site_settings_category.html"> |
| @@ -19,65 +20,85 @@ |
| <template> |
| <if expr="chromeos"> |
| <settings-section i18n-values="page-title:dateTimePageTitle" |
| - current-route="[[currentRoute]]" section="dateTime"> |
| - <settings-date-time-page prefs="{{prefs}}"> |
| - </settings-date-time-page> |
| + current-route="[[currentRoute]]" section="dateTime" |
| + hidden$="[[!pageVisible.dateTime]]"> |
| + <template is="dom-if" if="[[pageVisible.dateTime]]"> |
|
michaelpg
2015/12/02 19:22:51
why can't we include the <settings-section> itself
stevenjb
2015/12/02 21:57:10
We can, but then we have to explicitly add each se
|
| + <settings-date-time-page prefs="{{prefs}}"> |
| + </settings-date-time-page> |
| + </template> |
| </settings-section> |
| </if> |
| <settings-section i18n-values="page-title:siteSettingsLocation" |
| - current-route="[[currentRoute]]" section="location"> |
| - <site-settings-category id="locationCategory" prefs="{{prefs}}" |
| - current-route="{{currentRoute}}"> |
| - </site-settings-category> |
| + current-route="[[currentRoute]]" section="location" |
| + hidden$="[[!pageVisible.location]]"> |
| + <template is="dom-if" if="[[pageVisible.location]]"> |
| + <site-settings-category prefs="{{prefs}}" |
| + current-route="{{currentRoute}}"> |
| + </site-settings-category> |
| + </template> |
| </settings-section> |
| - |
| <settings-section i18n-values="page-title:privacyPageTitle" |
| - current-route="[[currentRoute]]" section="privacy"> |
| - <settings-privacy-page prefs="{{prefs}}" |
| - current-route="{{currentRoute}}"> |
| - </settings-privacy-page> |
| + current-route="[[currentRoute]]" section="privacy" |
| + hidden$="[[!pageVisible.privacy]]"> |
| + <template is="dom-if" if="[[pageVisible.privacy]]"> |
| + <settings-privacy-page prefs="{{prefs}}" |
| + current-route="{{currentRoute}}"> |
| + </settings-privacy-page> |
| + </template> |
| </settings-section> |
| - |
| <if expr="chromeos"> |
| <settings-section i18n-values="page-title:bluetoothPageTitle" |
| - current-route="[[currentRoute]]" section="bluetooth"> |
| - <settings-bluetooth-page current-route="{{currentRoute}}"> |
| - </settings-bluetooth-page> |
| + current-route="[[currentRoute]]" section="bluetooth" |
| + hidden$="[[!pageVisible.bluetooth]]"> |
| + <template is="dom-if" if="[[pageVisible.bluetooth]]"> |
| + <settings-bluetooth-page current-route="{{currentRoute}}"> |
| + </settings-bluetooth-page> |
| + </template> |
| </settings-section> |
| </if> |
| - <settings-section |
| - i18n-values="page-title:passwordsAndAutofillPageTitle" |
| - current-route="[[currentRoute]]" section="passwordsAndForms"> |
| - <settings-passwords-and-forms-page prefs="{{prefs}}" |
| - current-route="{{currentRoute}}"> |
| - </settings-passwords-and-forms-page> |
| + <settings-section i18n-values="page-title:passwordsAndAutofillPageTitle" |
| + current-route="[[currentRoute]]" section="passwordsAndForms" |
| + hidden$="[[!pageVisible.passwordsAndForms]]"> |
| + <template is="dom-if" if="[[pageVisible.passwordsAndForms]]"> |
| + <settings-passwords-and-forms-page prefs="{{prefs}}" |
| + current-route="{{currentRoute}}"> |
| + </settings-passwords-and-forms-page> |
| + </template> |
| </settings-section> |
| - |
| <settings-section i18n-values="page-title:languagesPageTitle" |
| - current-route="[[currentRoute]]" section="languages"> |
| - <settings-languages-page prefs="{{prefs}}" |
| - current-route="{{currentRoute}}"> |
| - </settings-languages-page> |
| + current-route="[[currentRoute]]" section="languages" |
| + hidden$="[[!pageVisible.languages]]"> |
| + <template is="dom-if" if="[[pageVisible.languages]]"> |
| + <settings-languages-page prefs="{{prefs}}" |
| + current-route="{{currentRoute}}"> |
| + </settings-languages-page> |
| + </template> |
| </settings-section> |
| - |
| <settings-section i18n-values="page-title:downloadsPageTitle" |
| - current-route="[[currentRoute]]" section="downloads"> |
| - <settings-downloads-page prefs="{{prefs}}"> |
| - </settings-downloads-page> |
| + current-route="[[currentRoute]]" section="downloads" |
| + hidden$="[[!pageVisible.downloads]]"> |
| + <template is="dom-if" if="[[pageVisible.downloads]]"> |
| + <settings-downloads-page prefs="{{prefs}}"> |
| + </settings-downloads-page> |
| + </template> |
| </settings-section> |
| - |
| <settings-section i18n-values="page-title:resetPageTitle" |
| - current-route="[[currentRoute]]" section="reset"> |
| - <settings-reset-page></settings-reset-page> |
| + current-route="[[currentRoute]]" section="reset" |
| + hidden$="[[!pageVisible.reset]]"> |
| + <template is="dom-if" if="[[pageVisible.reset]]"> |
| + <settings-reset-page></settings-reset-page> |
| + </template> |
| </settings-section> |
| - |
| <if expr="chromeos"> |
| <!-- TODO(dbeam): find somewhere to stuff "Add more accessibility features" |
| on desktop. --> |
| <settings-section i18n-values="page-title:a11yPageTitle" |
| - current-route="[[currentRoute]]" section="a11y"> |
| - <settings-a11y-page prefs="{{prefs}}"></settings-a11y-page> |
| + current-route="[[currentRoute]]" section="a11y" |
| + hidden$="[[!pageVisible.a11y]]"> |
| + <template is="dom-if" if="[[pageVisible.a11y]]"> |
| + <settings-a11y-page prefs="{{prefs}}"></settings-a11y-page> |
| + </template> |
| </settings-section> |
| </if> |
| </template> |