| 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/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 7 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 7 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 8 <link rel="import" href="/controls/settings_checkbox.html"> | 8 <link rel="import" href="/controls/settings_checkbox.html"> |
| 9 <link rel="import" href="/people_page/sync_page.html"> | 9 <link rel="import" href="/people_page/sync_page.html"> |
| 10 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> | 10 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> |
| 11 <link rel="import" href="/people_page/sync_browser_proxy.html"> | 11 <link rel="import" href="/people_page/sync_browser_proxy.html"> |
| 12 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 12 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 13 <link rel="import" href="/settings_page/settings_subpage.html"> | 13 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 14 <link rel="import" href="/settings_shared_css.html"> | 14 <link rel="import" href="/settings_shared_css.html"> |
| 15 | 15 |
| 16 <if expr="chromeos"> | 16 <if expr="chromeos"> |
| 17 <link rel="import" href="/people_page/change_picture.html"> | 17 <link rel="import" href="/people_page/change_picture.html"> |
| 18 <link rel="import" href="/people_page/easy_unlock_browser_proxy.html"> | 18 <link rel="import" href="/people_page/easy_unlock_browser_proxy.html"> |
| 19 <link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html"> | 19 <link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html"> |
| 20 <link rel="import" href="/people_page/quick_unlock_authenticate.html"> | 20 <link rel="import" href="/people_page/quick_unlock_authenticate.html"> |
| 21 <link rel="import" href="/people_page/quick_unlock_choose_method.html"> | 21 <link rel="import" href="/people_page/quick_unlock_choose_method.html"> |
| 22 <link rel="import" href="/people_page/quick_unlock_setup_pin.html"> |
| 22 <link rel="import" href="/people_page/users_page.html"> | 23 <link rel="import" href="/people_page/users_page.html"> |
| 23 </if> | 24 </if> |
| 24 <if expr="not chromeos"> | 25 <if expr="not chromeos"> |
| 25 <link rel="import" href="/people_page/manage_profile.html"> | 26 <link rel="import" href="/people_page/manage_profile.html"> |
| 26 </if> | 27 </if> |
| 27 | 28 |
| 28 <dom-module id="settings-people-page"> | 29 <dom-module id="settings-people-page"> |
| 29 <template> | 30 <template> |
| 30 <style include="settings-shared"> | 31 <style include="settings-shared"> |
| 31 setting-box.middle { | 32 setting-box.middle { |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 </template> | 252 </template> |
| 252 <template is="dom-if" name="quick-unlock-choose-method"> | 253 <template is="dom-if" name="quick-unlock-choose-method"> |
| 253 <settings-subpage page-title="$i18n{quickUnlockTitle}"> | 254 <settings-subpage page-title="$i18n{quickUnlockTitle}"> |
| 254 <settings-quick-unlock-choose-method | 255 <settings-quick-unlock-choose-method |
| 255 set-modes="[[quickUnlockSetModes]]" | 256 set-modes="[[quickUnlockSetModes]]" |
| 256 current-route="{{currentRoute}}" | 257 current-route="{{currentRoute}}" |
| 257 prefs="{{prefs}}"> | 258 prefs="{{prefs}}"> |
| 258 </settings-quick-unlock-choose-method> | 259 </settings-quick-unlock-choose-method> |
| 259 </settings-subpage> | 260 </settings-subpage> |
| 260 </template> | 261 </template> |
| 262 <template is="dom-if" name="quick-unlock-setup-pin"> |
| 263 <settings-subpage page-title="$i18n{quickUnlockTitle}"> |
| 264 <settings-quick-unlock-setup-pin |
| 265 set-modes="[[quickUnlockSetModes]]" |
| 266 current-route="{{currentRoute}}"> |
| 267 </settings-quick-unlock-setup-pin> |
| 268 </settings-subpage> |
| 269 </template> |
| 261 <template is="dom-if" name="users"> | 270 <template is="dom-if" name="users"> |
| 262 <settings-subpage page-title="$i18n{usersPageTitle}"> | 271 <settings-subpage page-title="$i18n{usersPageTitle}"> |
| 263 <settings-users-page prefs="{{prefs}}"></settings-users-page> | 272 <settings-users-page prefs="{{prefs}}"></settings-users-page> |
| 264 </settings-subpage> | 273 </settings-subpage> |
| 265 </template> | 274 </template> |
| 266 <template is="dom-if" name="changePicture"> | 275 <template is="dom-if" name="changePicture"> |
| 267 <settings-subpage page-title="$i18n{changePictureTitle}"> | 276 <settings-subpage page-title="$i18n{changePictureTitle}"> |
| 268 <settings-change-picture></settings-change-picture> | 277 <settings-change-picture></settings-change-picture> |
| 269 </settings-subpage> | 278 </settings-subpage> |
| 270 </template> | 279 </template> |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 | 315 |
| 307 <if expr="chromeos"> | 316 <if expr="chromeos"> |
| 308 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 317 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 309 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 318 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 310 </easy-unlock-turn-off-dialog> | 319 </easy-unlock-turn-off-dialog> |
| 311 </template> | 320 </template> |
| 312 </if> | 321 </if> |
| 313 </template> | 322 </template> |
| 314 <script src="people_page.js"></script> | 323 <script src="people_page.js"></script> |
| 315 </dom-module> | 324 </dom-module> |
| OLD | NEW |