| 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..0052b07d21e2ff6bd5322be21162f8ba3ea15220 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">
|
| @@ -18,67 +19,79 @@
|
| <link rel="import" type="css" href="advanced_page.css">
|
| <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>
|
| - </settings-section>
|
| + <template is="dom-if" if="[[pageVisible.dateTime]]">
|
| + <settings-section i18n-values="page-title:dateTimePageTitle"
|
| + current-route="[[currentRoute]]" section="dateTime">
|
| + <settings-date-time-page prefs="{{prefs}}">
|
| + </settings-date-time-page>
|
| + </settings-section>
|
| + </template>
|
| </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>
|
| - </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>
|
| - </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>
|
| - </settings-section>
|
| -</if>
|
| -
|
| - <settings-section
|
| - i18n-values="page-title:passwordsAndAutofillPageTitle"
|
| - current-route="[[currentRoute]]" section="passwordsAndForms">
|
| - <settings-passwords-and-forms-page prefs="{{prefs}}"
|
| + <template is="dom-if" if="[[pageVisible.location]]">
|
| + <settings-section i18n-values="page-title:siteSettingsLocation"
|
| + current-route="[[currentRoute]]" section="location">
|
| + <site-settings-category prefs="{{prefs}}"
|
| current-route="{{currentRoute}}">
|
| - </settings-passwords-and-forms-page>
|
| - </settings-section>
|
| -
|
| - <settings-section i18n-values="page-title:languagesPageTitle"
|
| - current-route="[[currentRoute]]" section="languages">
|
| - <settings-languages-page prefs="{{prefs}}"
|
| + </site-settings-category>
|
| + </settings-section>
|
| + </template>
|
| + <template is="dom-if" if="[[pageVisible.privacy]]">
|
| + <settings-section i18n-values="page-title:privacyPageTitle"
|
| + current-route="[[currentRoute]]" section="privacy">
|
| + <settings-privacy-page prefs="{{prefs}}"
|
| current-route="{{currentRoute}}">
|
| - </settings-languages-page>
|
| - </settings-section>
|
| -
|
| - <settings-section i18n-values="page-title:downloadsPageTitle"
|
| - current-route="[[currentRoute]]" section="downloads">
|
| - <settings-downloads-page prefs="{{prefs}}">
|
| - </settings-downloads-page>
|
| - </settings-section>
|
| -
|
| - <settings-section i18n-values="page-title:resetPageTitle"
|
| - current-route="[[currentRoute]]" section="reset">
|
| - <settings-reset-page></settings-reset-page>
|
| - </settings-section>
|
| + </settings-privacy-page>
|
| + </settings-section>
|
| + </template>
|
| +<if expr="chromeos">
|
| + <template is="dom-if" if="[[pageVisible.bluetooth]]">
|
| + <settings-section i18n-values="page-title:bluetoothPageTitle"
|
| + current-route="[[currentRoute]]" section="bluetooth">
|
| + <settings-bluetooth-page current-route="{{currentRoute}}">
|
| + </settings-bluetooth-page>
|
| + </settings-section>
|
| + </template>
|
| +</if>
|
|
|
| + <template is="dom-if" if="[[pageVisible.passwordsAndForms]]">
|
| + <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>
|
| + </template>
|
| + <template is="dom-if" if="[[pageVisible.languages]]">
|
| + <settings-section i18n-values="page-title:languagesPageTitle"
|
| + current-route="[[currentRoute]]" section="languages">
|
| + <settings-languages-page prefs="{{prefs}}"
|
| + current-route="{{currentRoute}}">
|
| + </settings-languages-page>
|
| + </settings-section>
|
| + </template>
|
| + <template is="dom-if" if="[[pageVisible.downloads]]">
|
| + <settings-section i18n-values="page-title:downloadsPageTitle"
|
| + current-route="[[currentRoute]]" section="downloads">
|
| + <settings-downloads-page prefs="{{prefs}}">
|
| + </settings-downloads-page>
|
| + </settings-section>
|
| + </template>
|
| + <template is="dom-if" if="[[pageVisible.reset]]">
|
| + <settings-section i18n-values="page-title:resetPageTitle"
|
| + current-route="[[currentRoute]]" section="reset">
|
| + <settings-reset-page></settings-reset-page>
|
| + </settings-section>
|
| + </template>
|
| <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>
|
| - </settings-section>
|
| + <template is="dom-if" if="[[pageVisible.a11y]]">
|
| + <settings-section i18n-values="page-title:a11yPageTitle"
|
| + current-route="[[currentRoute]]" section="a11y">
|
| + <settings-a11y-page prefs="{{prefs}}"></settings-a11y-page>
|
| + </settings-section>
|
| + </template>
|
| </if>
|
| </template>
|
| <script src="chrome://md-settings/advanced_page/advanced_page.js"></script>
|
|
|