| Index: chrome/browser/resources/settings/basic_page/basic_page.html
|
| diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chrome/browser/resources/settings/basic_page/basic_page.html
|
| index 992dfc5b853e98cf10a45f583bca3505273eef44..c97f4aba1e212acc5935425a101b7c6610e08170 100644
|
| --- a/chrome/browser/resources/settings/basic_page/basic_page.html
|
| +++ b/chrome/browser/resources/settings/basic_page/basic_page.html
|
| @@ -1,6 +1,7 @@
|
| <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
|
| <link rel="import" href="chrome://md-settings/appearance_page/appearance_page.html">
|
| <link rel="import" href="chrome://md-settings/search_page/search_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/on_startup_page/on_startup_page.html">
|
|
|
| @@ -18,53 +19,65 @@
|
| <link rel="import" type="css" href="basic_page.css">
|
| <template>
|
| <if expr="not chromeos">
|
| - <settings-section i18n-values="page-title:peoplePageTitle"
|
| - current-route="[[currentRoute]]" section="people">
|
| - <settings-signin-page current-route="{{currentRoute}}">
|
| - </settings-signin-page>
|
| - </settings-section>
|
| + <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp>
|
| + <settings-section i18n-values="page-title:peoplePageTitle"
|
| + current-route="[[currentRoute]]" section="people">
|
| + <settings-signin-page current-route="{{currentRoute}}">
|
| + </settings-signin-page>
|
| + </settings-section>
|
| + </template>
|
| </if>
|
| <if expr="chromeos">
|
| - <settings-section i18n-values="page-title:internetPageTitle"
|
| - current-route="[[currentRoute]]" section="internet">
|
| - <settings-internet-page current-route="{{currentRoute}}">
|
| - </settings-internet-page>
|
| - </settings-section>
|
| + <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp>
|
| + <settings-section i18n-values="page-title:internetPageTitle"
|
| + current-route="[[currentRoute]]" section="internet">
|
| + <settings-internet-page current-route="{{currentRoute}}">
|
| + </settings-internet-page>
|
| + </settings-section>
|
| + </template>
|
| </if>
|
| - <settings-section i18n-values="page-title:appearancePageTitle"
|
| - current-route="[[currentRoute]]" section="appearance">
|
| - <settings-appearance-page prefs="{{prefs}}"
|
| - current-route="[[currentRoute]]">
|
| - </settings-appearance-page>
|
| - </settings-section>
|
| -
|
| - <settings-section i18n-values="page-title:onStartup"
|
| - current-route="[[currentRoute]]" section="onStartup">
|
| - <settings-on-startup-page prefs="{{prefs}}"
|
| - current-route="{{currentRoute}}">
|
| - </settings-on-startup-page>
|
| - </settings-section>
|
| -
|
| - <settings-section i18n-values="page-title:searchPageTitle"
|
| - current-route="[[currentRoute]]" section="search">
|
| - <settings-search-page current-route="{{currentRoute}}">
|
| - </settings-search-page>
|
| - </settings-section>
|
| -
|
| + <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]" restamp>
|
| + <settings-section i18n-values="page-title:appearancePageTitle"
|
| + current-route="[[currentRoute]]" section="appearance">
|
| + <settings-appearance-page prefs="{{prefs}}"
|
| + current-route="[[currentRoute]]">
|
| + </settings-appearance-page>
|
| + </settings-section>
|
| + </template>
|
| + <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restamp>
|
| + <settings-section i18n-values="page-title:onStartup"
|
| + current-route="[[currentRoute]]" section="onStartup">
|
| + <settings-on-startup-page prefs="{{prefs}}"
|
| + current-route="{{currentRoute}}">
|
| + </settings-on-startup-page>
|
| + </settings-section>
|
| + </template>
|
| + <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp>
|
| + <settings-section i18n-values="page-title:searchPageTitle"
|
| + current-route="[[currentRoute]]" section="search">
|
| + <settings-search-page current-route="{{currentRoute}}">
|
| + </settings-search-page>
|
| + </settings-section>
|
| + </template>
|
| <if expr="chromeos">
|
| - <settings-section i18n-values="page-title:usersPageTitle"
|
| - current-route="[[currentRoute]]" section="users">
|
| - <settings-users-page prefs="{{prefs}}"></settings-users-page>
|
| - </settings-section>
|
| + <template is="dom-if" if="[[showPage(pageVisibility.users)]]" restamp>
|
| + <settings-section i18n-values="page-title:usersPageTitle"
|
| + current-route="[[currentRoute]]" section="users">
|
| + <settings-users-page prefs="{{prefs}}"></settings-users-page>
|
| + </settings-section>
|
| + </template>
|
| </if>
|
|
|
| <if expr="not chromeos">
|
| - <settings-section i18n-values="page-title:defaultBrowser"
|
| - expand-container="{{expandContainer}}"
|
| - current-route="[[currentRoute]]" section="defaultBrowser">
|
| - <settings-default-browser-page>
|
| - </settings-default-browser-page>
|
| - </settings-section>
|
| + <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]"
|
| + restamp>
|
| + <settings-section i18n-values="page-title:defaultBrowser"
|
| + expand-container="{{expandContainer}}"
|
| + current-route="[[currentRoute]]" section="defaultBrowser">
|
| + <settings-default-browser-page>
|
| + </settings-default-browser-page>
|
| + </settings-section>
|
| + </template>
|
| </if>
|
| </template>
|
| <script src="basic_page.js"></script>
|
|
|