| 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 75f851c125c4c047341ffcaa2a02971c76e0fb97..1be6f4297ba0a69559c0ff86227c13e3776916ae 100644
|
| --- a/chrome/browser/resources/settings/people_page/people_page.html
|
| +++ b/chrome/browser/resources/settings/people_page/people_page.html
|
| @@ -26,6 +26,7 @@
|
| <link rel="import" href="/people_page/users_page.html">
|
| </if>
|
| <if expr="not chromeos">
|
| +<link rel="import" href="/people_page/import_data_dialog.html">
|
| <link rel="import" href="/people_page/manage_profile.html">
|
| </if>
|
|
|
| @@ -263,6 +264,13 @@
|
| <button class="subpage-arrow" is="paper-icon-button-light"></button>
|
| </div>
|
|
|
| +<if expr="not chromeos">
|
| + <div class="settings-box" on-tap="onImportDataTap_" actionable>
|
| + <div class="start">$i18n{importTitle}</div>
|
| + <button class="subpage-arrow" is="paper-icon-button-light"></button>
|
| + </div>
|
| +</if>
|
| +
|
| <template is="dom-if" if=[[profileManagesSupervisedUsers_]]>
|
| <div id="manageSupervisedUsersContainer" class="settings-box two-line"
|
| on-tap="onManageSupervisedUsers_" actionable>
|
| @@ -350,6 +358,12 @@
|
| </div>
|
| </dialog>
|
|
|
| + <template is="dom-if" if="[[showImportDataDialog_]]" restamp>
|
| + <settings-import-data-dialog prefs="{{prefs}}"
|
| + on-close="onImportDataDialogClosed_">
|
| + </settings-import-data-dialog>
|
| + </template>
|
| +
|
| <if expr="chromeos">
|
| <template is="dom-if" if="[[easyUnlockEnabled_]]">
|
| <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog">
|
|
|