| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/html/icon.html"> | 5 <link rel="import" href="chrome://resources/html/icon.html"> |
| 6 <link rel="import" href="chrome://resources/html/polymer.html"> | 6 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 13 <link rel="import" href="../controls/settings_toggle_button.html"> | 13 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 14 <link rel="import" href="sync_page.html"> | 14 <link rel="import" href="sync_page.html"> |
| 15 <link rel="import" href="profile_info_browser_proxy.html"> | 15 <link rel="import" href="profile_info_browser_proxy.html"> |
| 16 <link rel="import" href="sync_browser_proxy.html"> | 16 <link rel="import" href="sync_browser_proxy.html"> |
| 17 <link rel="import" href="../route.html"> | 17 <link rel="import" href="../route.html"> |
| 18 <link rel="import" href="../settings_page/settings_animated_pages.html"> | 18 <link rel="import" href="../settings_page/settings_animated_pages.html"> |
| 19 <link rel="import" href="../settings_page/settings_subpage.html"> | 19 <link rel="import" href="../settings_page/settings_subpage.html"> |
| 20 <link rel="import" href="../settings_shared_css.html"> | 20 <link rel="import" href="../settings_shared_css.html"> |
| 21 | 21 |
| 22 <if expr="chromeos"> | 22 <if expr="chromeos"> |
| 23 <link rel="import" href="change_picture.html"> | 23 <link rel="import" href="change_picture.html"> |
| 24 <link rel="import" href="easy_unlock_browser_proxy.html"> | 24 <link rel="import" href="easy_unlock_browser_proxy.html"> |
| 25 <link rel="import" href="easy_unlock_turn_off_dialog.html"> | 25 <link rel="import" href="easy_unlock_turn_off_dialog.html"> |
| 26 <link rel="import" href="fingerprint_list.html"> |
| 26 <link rel="import" href="lock_screen.html"> | 27 <link rel="import" href="lock_screen.html"> |
| 27 <link rel="import" href="lock_state_behavior.html"> | 28 <link rel="import" href="lock_state_behavior.html"> |
| 28 <link rel="import" href="users_page.html"> | 29 <link rel="import" href="users_page.html"> |
| 29 </if> | 30 </if> |
| 30 <if expr="not chromeos"> | 31 <if expr="not chromeos"> |
| 31 <link rel="import" href="import_data_dialog.html"> | 32 <link rel="import" href="import_data_dialog.html"> |
| 32 <link rel="import" href="manage_profile.html"> | 33 <link rel="import" href="manage_profile.html"> |
| 33 </if> | 34 </if> |
| 34 | 35 |
| 35 <dom-module id="settings-people-page"> | 36 <dom-module id="settings-people-page"> |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 <if expr="chromeos"> | 313 <if expr="chromeos"> |
| 313 <template is="dom-if" if="[[quickUnlockEnabled_]]"> | 314 <template is="dom-if" if="[[quickUnlockEnabled_]]"> |
| 314 <template is="dom-if" route-path="/lockScreen" no-search> | 315 <template is="dom-if" route-path="/lockScreen" no-search> |
| 315 <settings-subpage page-title="$i18n{lockScreenTitle}"> | 316 <settings-subpage page-title="$i18n{lockScreenTitle}"> |
| 316 <settings-lock-screen | 317 <settings-lock-screen |
| 317 prefs="{{prefs}}"> | 318 prefs="{{prefs}}"> |
| 318 </settings-lock-screen> | 319 </settings-lock-screen> |
| 319 </settings-subpage> | 320 </settings-subpage> |
| 320 </template> | 321 </template> |
| 321 </template> | 322 </template> |
| 323 <template is="dom-if" route-path="/lockScreen/fingerprint"> |
| 324 <settings-subpage page-title="$i18n{lockScreenFingerprintTitle}"> |
| 325 <settings-fingerprint-list></settings-fingerprint-list> |
| 326 </settings-subpage> |
| 327 </template> |
| 322 <template is="dom-if" route-path="/accounts"> | 328 <template is="dom-if" route-path="/accounts"> |
| 323 <settings-subpage | 329 <settings-subpage |
| 324 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" | 330 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" |
| 325 page-title="$i18n{usersPageTitle}"> | 331 page-title="$i18n{usersPageTitle}"> |
| 326 <settings-users-page prefs="{{prefs}}"></settings-users-page> | 332 <settings-users-page prefs="{{prefs}}"></settings-users-page> |
| 327 </settings-subpage> | 333 </settings-subpage> |
| 328 </template> | 334 </template> |
| 329 <template is="dom-if" route-path="/changePicture"> | 335 <template is="dom-if" route-path="/changePicture"> |
| 330 <settings-subpage | 336 <settings-subpage |
| 331 associated-control="[[$$('#picture-subpage-trigger')]]" | 337 associated-control="[[$$('#picture-subpage-trigger')]]" |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 <if expr="chromeos"> | 402 <if expr="chromeos"> |
| 397 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 403 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> |
| 398 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 404 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
| 399 on-close="onEasyUnlockTurnOffDialogClose_"> | 405 on-close="onEasyUnlockTurnOffDialogClose_"> |
| 400 </easy-unlock-turn-off-dialog> | 406 </easy-unlock-turn-off-dialog> |
| 401 </template> | 407 </template> |
| 402 </if> | 408 </if> |
| 403 </template> | 409 </template> |
| 404 <script src="people_page.js"></script> | 410 <script src="people_page.js"></script> |
| 405 </dom-module> | 411 </dom-module> |
| OLD | NEW |