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/polymer/v1_0/paper-dialog/paper-dial
og.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial
og.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/users_page.html"> | 22 <link rel="import" href="/people_page/users_page.html"> |
22 </if> | 23 </if> |
23 <if expr="not chromeos"> | 24 <if expr="not chromeos"> |
24 <link rel="import" href="/people_page/manage_profile.html"> | 25 <link rel="import" href="/people_page/manage_profile.html"> |
25 </if> | 26 </if> |
26 | 27 |
27 <dom-module id="settings-people-page"> | 28 <dom-module id="settings-people-page"> |
28 <template> | 29 <template> |
29 <style include="settings-shared"> | 30 <style include="settings-shared"> |
30 setting-box.middle { | 31 setting-box.middle { |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 <template is="dom-if" name="sync"> | 234 <template is="dom-if" name="sync"> |
234 <settings-subpage page-title="$i18n{syncPageTitle}"> | 235 <settings-subpage page-title="$i18n{syncPageTitle}"> |
235 <settings-sync-page current-route="[[currentRoute]]"> | 236 <settings-sync-page current-route="[[currentRoute]]"> |
236 </settings-sync-page> | 237 </settings-sync-page> |
237 </settings-subpage> | 238 </settings-subpage> |
238 </template> | 239 </template> |
239 <if expr="chromeos"> | 240 <if expr="chromeos"> |
240 <template is="dom-if" name="quick-unlock-authenticate"> | 241 <template is="dom-if" name="quick-unlock-authenticate"> |
241 <settings-subpage page-title="$i18n{quickUnlockTitle}"> | 242 <settings-subpage page-title="$i18n{quickUnlockTitle}"> |
242 <settings-quick-unlock-authenticate | 243 <settings-quick-unlock-authenticate |
243 account-password="{{quickUnlockAccountPassword}}" | 244 set-modes="{{quickUnlockSetModes}}" |
244 current-route="{{currentRoute}}" | 245 current-route="{{currentRoute}}" |
245 profile-name="[[profileName_]]"> | 246 profile-name="[[profileName_]]"> |
246 </settings-quick-unlock-authenticate> | 247 </settings-quick-unlock-authenticate> |
247 </settings-subpage> | 248 </settings-subpage> |
248 </template> | 249 </template> |
| 250 <template is="dom-if" name="quick-unlock-choose-method"> |
| 251 <settings-subpage page-title="$i18n{quickUnlockTitle}"> |
| 252 <settings-quick-unlock-choose-method |
| 253 set-modes="[[quickUnlockSetModes]]" |
| 254 current-route="{{currentRoute}}" |
| 255 prefs="{{prefs}}"> |
| 256 </settings-quick-unlock-choose-method> |
| 257 </settings-subpage> |
| 258 </template> |
249 <template is="dom-if" name="users"> | 259 <template is="dom-if" name="users"> |
250 <settings-subpage page-title="$i18n{usersPageTitle}"> | 260 <settings-subpage page-title="$i18n{usersPageTitle}"> |
251 <settings-users-page prefs="{{prefs}}"></settings-users-page> | 261 <settings-users-page prefs="{{prefs}}"></settings-users-page> |
252 </settings-subpage> | 262 </settings-subpage> |
253 </template> | 263 </template> |
254 <template is="dom-if" name="changePicture"> | 264 <template is="dom-if" name="changePicture"> |
255 <settings-subpage page-title="$i18n{changePictureTitle}"> | 265 <settings-subpage page-title="$i18n{changePictureTitle}"> |
256 <settings-change-picture></settings-change-picture> | 266 <settings-change-picture></settings-change-picture> |
257 </settings-subpage> | 267 </settings-subpage> |
258 </template> | 268 </template> |
(...skipping 28 matching lines...) Expand all Loading... |
287 | 297 |
288 <if expr="chromeos"> | 298 <if expr="chromeos"> |
289 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 299 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
290 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 300 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
291 </easy-unlock-turn-off-dialog> | 301 </easy-unlock-turn-off-dialog> |
292 </template> | 302 </template> |
293 </if> | 303 </if> |
294 </template> | 304 </template> |
295 <script src="people_page.js"></script> | 305 <script src="people_page.js"></script> |
296 </dom-module> | 306 </dom-module> |
OLD | NEW |