| 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 da368353dddafb3f76fb32d071bbb2d8051d6e05..9ca6f77c77395cc96a234acdf843c811c5d377ea 100644
|
| --- a/chrome/browser/resources/settings/people_page/people_page.html
|
| +++ b/chrome/browser/resources/settings/people_page/people_page.html
|
| @@ -9,7 +9,7 @@
|
| <link rel="import" href="chrome://md-settings/people_page/sync_page.html">
|
| <link rel="import" href="chrome://md-settings/people_page/sync_private_api.html">
|
| <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pages.html">
|
| -<link rel="import" href="chrome://md-settings/settings_page/settings_subheader.html">
|
| +<link rel="import" href="chrome://md-settings/settings_page/settings_subpage.html">
|
| <link rel="import" href="chrome://md-settings/settings_shared_css.html">
|
|
|
| <if expr="chromeos">
|
| @@ -155,32 +155,32 @@
|
| </paper-button>
|
| </div>
|
| </neon-animatable>
|
| - <neon-animatable id="sync">
|
| - <settings-subheader i18n-values="page-title:syncPageTitle">
|
| - </settings-subheader>
|
| - <settings-sync-page current-route="[[currentRoute]]">
|
| - </settings-sync-page>
|
| - </neon-animatable>
|
| + <template is="dom-if" name="sync">
|
| + <settings-subpage page-title="[[i18n('syncPageTitle')]]">
|
| + <settings-sync-page current-route="[[currentRoute]]">
|
| + </settings-sync-page>
|
| + </settings-subpage>
|
| + </template>
|
| <if expr="chromeos">
|
| - <neon-animatable id="users">
|
| - <settings-subheader i18n-values="page-title:usersPageTitle">
|
| - </settings-subheader>
|
| - <settings-users-page prefs="{{prefs}}"></settings-users-page>
|
| - </neon-animatable>
|
| - <neon-animatable id="changePicture">
|
| - <settings-subheader i18n-values="page-title:changePictureTitle">
|
| - </settings-subheader>
|
| - <settings-change-picture></settings-change-picture>
|
| - </neon-animatable>
|
| + <template is="dom-if" name="users">
|
| + <settings-subpage 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-change-picture></settings-change-picture>
|
| + </settings-subpage>
|
| + </template>
|
| </if>
|
| <if expr="not chromeos">
|
| - <neon-animatable id="manageProfile">
|
| - <settings-subheader i18n-values="page-title:editPerson">
|
| - </settings-subheader>
|
| - <settings-manage-profile profile-icon-url="[[profileIconUrl_]]"
|
| - profile-name="[[profileName_]]">
|
| - </settings-manage-profile>
|
| - </neon-animatable>
|
| + <template is="dom-if" name="manageProfile">
|
| + <settings-subpage page-title="[[i18n('editPerson')]]">
|
| + <settings-manage-profile profile-icon-url="[[profileIconUrl_]]"
|
| + profile-name="[[profileName_]]">
|
| + </settings-manage-profile>
|
| + </settings-subpage>
|
| + </template>
|
| </if>
|
| </settings-animated-pages>
|
|
|
|
|