| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/html/icon.html"> | 3 <link rel="import" href="chrome://resources/html/icon.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 10 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 10 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 11 <link rel="import" href="/controls/settings_checkbox.html"> | 11 <link rel="import" href="/controls/settings_checkbox.html"> |
| 12 <link rel="import" href="/people_page/sync_page.html"> | 12 <link rel="import" href="/people_page/sync_page.html"> |
| 13 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> | 13 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> |
| 14 <link rel="import" href="/people_page/sync_browser_proxy.html"> | 14 <link rel="import" href="/people_page/sync_browser_proxy.html"> |
| 15 <link rel="import" href="/route.html"> | 15 <link rel="import" href="/route.html"> |
| 16 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 16 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 17 <link rel="import" href="/settings_page/settings_subpage.html"> | 17 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 18 <link rel="import" href="/settings_shared_css.html"> | 18 <link rel="import" href="/settings_shared_css.html"> |
| 19 | 19 |
| 20 <if expr="chromeos"> | 20 <if expr="chromeos"> |
| 21 <link rel="import" href="/people_page/change_picture.html"> | 21 <link rel="import" href="/people_page/change_picture.html"> |
| 22 <link rel="import" href="/people_page/easy_unlock_browser_proxy.html"> | 22 <link rel="import" href="/people_page/easy_unlock_browser_proxy.html"> |
| 23 <link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html"> | 23 <link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html"> |
| 24 <link rel="import" href="/people_page/lock_screen.html"> | 24 <link rel="import" href="/people_page/lock_screen.html"> |
| 25 <link rel="import" href="/people_page/lock_state_behavior.html"> | 25 <link rel="import" href="/people_page/lock_state_behavior.html"> |
| 26 <link rel="import" href="/people_page/users_page.html"> | 26 <link rel="import" href="/people_page/users_page.html"> |
| 27 </if> | 27 </if> |
| 28 <if expr="not chromeos"> | 28 <if expr="not chromeos"> |
| 29 <link rel="import" href="/people_page/import_data_dialog.html"> |
| 29 <link rel="import" href="/people_page/manage_profile.html"> | 30 <link rel="import" href="/people_page/manage_profile.html"> |
| 30 </if> | 31 </if> |
| 31 | 32 |
| 32 <dom-module id="settings-people-page"> | 33 <dom-module id="settings-people-page"> |
| 33 <template> | 34 <template> |
| 34 <style include="settings-shared"> | 35 <style include="settings-shared"> |
| 35 setting-box.middle { | 36 setting-box.middle { |
| 36 /* Per spec, middle text is indented 20px in this section. */ | 37 /* Per spec, middle text is indented 20px in this section. */ |
| 37 -webkit-margin-start: 20px; | 38 -webkit-margin-start: 20px; |
| 38 } | 39 } |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 <div id="manage-other-people-subpage-trigger" | 257 <div id="manage-other-people-subpage-trigger" |
| 257 class="settings-box two-line" on-tap="onManageOtherPeople_" | 258 class="settings-box two-line" on-tap="onManageOtherPeople_" |
| 258 actionable> | 259 actionable> |
| 259 <div class="start"> | 260 <div class="start"> |
| 260 $i18n{manageOtherPeople} | 261 $i18n{manageOtherPeople} |
| 261 <div class="secondary">$i18n{manageOtherPeopleDescription}</div> | 262 <div class="secondary">$i18n{manageOtherPeopleDescription}</div> |
| 262 </div> | 263 </div> |
| 263 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 264 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 264 </div> | 265 </div> |
| 265 | 266 |
| 267 <if expr="not chromeos"> |
| 268 <div class="settings-box" on-tap="onImportDataTap_" actionable> |
| 269 <div class="start">$i18n{importTitle}</div> |
| 270 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 271 </div> |
| 272 </if> |
| 273 |
| 266 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> | 274 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> |
| 267 <div id="manageSupervisedUsersContainer" class="settings-box two-line" | 275 <div id="manageSupervisedUsersContainer" class="settings-box two-line" |
| 268 on-tap="onManageSupervisedUsers_" actionable> | 276 on-tap="onManageSupervisedUsers_" actionable> |
| 269 <div class="start"> | 277 <div class="start"> |
| 270 $i18n{manageSupervisedUsers} | 278 $i18n{manageSupervisedUsers} |
| 271 <div class="secondary"> | 279 <div class="secondary"> |
| 272 $i18n{manageSupervisedUsersDescription} | 280 $i18n{manageSupervisedUsersDescription} |
| 273 </div> | 281 </div> |
| 274 </div> | 282 </div> |
| 275 <button class="icon-external" is="paper-icon-button-light"></button> | 283 <button class="icon-external" is="paper-icon-button-light"></button> |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 hidden=[[syncStatus.domain]] on-tap="onDisconnectConfirm_"> | 351 hidden=[[syncStatus.domain]] on-tap="onDisconnectConfirm_"> |
| 344 $i18n{syncDisconnect} | 352 $i18n{syncDisconnect} |
| 345 </paper-button> | 353 </paper-button> |
| 346 <paper-button id="disconnectManagedProfileConfirm" class="action-button" | 354 <paper-button id="disconnectManagedProfileConfirm" class="action-button" |
| 347 hidden=[[!syncStatus.domain]] on-tap="onDisconnectConfirm_"> | 355 hidden=[[!syncStatus.domain]] on-tap="onDisconnectConfirm_"> |
| 348 $i18n{syncDisconnectConfirm} | 356 $i18n{syncDisconnectConfirm} |
| 349 </paper-button> | 357 </paper-button> |
| 350 </div> | 358 </div> |
| 351 </dialog> | 359 </dialog> |
| 352 | 360 |
| 361 <template is="dom-if" if="[[showImportDataDialog_]]" restamp> |
| 362 <settings-import-data-dialog on-close="onImportDataDialogClosed_"> |
| 363 </settings-import-data-dialog> |
| 364 </template> |
| 365 |
| 353 <if expr="chromeos"> | 366 <if expr="chromeos"> |
| 354 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 367 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 355 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 368 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 356 </easy-unlock-turn-off-dialog> | 369 </easy-unlock-turn-off-dialog> |
| 357 </template> | 370 </template> |
| 358 </if> | 371 </if> |
| 359 </template> | 372 </template> |
| 360 <script src="people_page.js"></script> | 373 <script src="people_page.js"></script> |
| 361 </dom-module> | 374 </dom-module> |
| OLD | NEW |