Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1417)

Side by Side Diff: chrome/browser/resources/settings/people_page/people_page.html

Issue 2097673002: Add a settings screen that lets the user choose how they unlock their device. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pin-unlock-settings-authenticate
Patch Set: Address comments Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 <template is="dom-if" name="sync"> 236 <template is="dom-if" name="sync">
236 <settings-subpage page-title="$i18n{syncPageTitle}"> 237 <settings-subpage page-title="$i18n{syncPageTitle}">
237 <settings-sync-page current-route="[[currentRoute]]"> 238 <settings-sync-page current-route="[[currentRoute]]">
238 </settings-sync-page> 239 </settings-sync-page>
239 </settings-subpage> 240 </settings-subpage>
240 </template> 241 </template>
241 <if expr="chromeos"> 242 <if expr="chromeos">
242 <template is="dom-if" name="quick-unlock-authenticate"> 243 <template is="dom-if" name="quick-unlock-authenticate">
243 <settings-subpage page-title="$i18n{quickUnlockTitle}"> 244 <settings-subpage page-title="$i18n{quickUnlockTitle}">
244 <settings-quick-unlock-authenticate 245 <settings-quick-unlock-authenticate
245 account-password="{{quickUnlockAccountPassword}}" 246 set-modes="{{quickUnlockSetModes}}"
246 current-route="{{currentRoute}}" 247 current-route="{{currentRoute}}"
247 profile-name="[[profileName_]]"> 248 profile-name="[[profileName_]]">
248 </settings-quick-unlock-authenticate> 249 </settings-quick-unlock-authenticate>
249 </settings-subpage> 250 </settings-subpage>
250 </template> 251 </template>
252 <template is="dom-if" name="quick-unlock-choose-method">
253 <settings-subpage page-title="$i18n{quickUnlockTitle}">
254 <settings-quick-unlock-choose-method
255 set-modes="[[quickUnlockSetModes]]"
256 current-route="{{currentRoute}}"
257 prefs="{{prefs}}">
258 </settings-quick-unlock-choose-method>
259 </settings-subpage>
260 </template>
251 <template is="dom-if" name="users"> 261 <template is="dom-if" name="users">
252 <settings-subpage page-title="$i18n{usersPageTitle}"> 262 <settings-subpage page-title="$i18n{usersPageTitle}">
253 <settings-users-page prefs="{{prefs}}"></settings-users-page> 263 <settings-users-page prefs="{{prefs}}"></settings-users-page>
254 </settings-subpage> 264 </settings-subpage>
255 </template> 265 </template>
256 <template is="dom-if" name="changePicture"> 266 <template is="dom-if" name="changePicture">
257 <settings-subpage page-title="$i18n{changePictureTitle}"> 267 <settings-subpage page-title="$i18n{changePictureTitle}">
258 <settings-change-picture></settings-change-picture> 268 <settings-change-picture></settings-change-picture>
259 </settings-subpage> 269 </settings-subpage>
260 </template> 270 </template>
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 306
297 <if expr="chromeos"> 307 <if expr="chromeos">
298 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 308 <template is="dom-if" if="[[easyUnlockEnabled_]]">
299 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> 309 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog">
300 </easy-unlock-turn-off-dialog> 310 </easy-unlock-turn-off-dialog>
301 </template> 311 </template>
302 </if> 312 </if>
303 </template> 313 </template>
304 <script src="people_page.js"></script> 314 <script src="people_page.js"></script>
305 </dom-module> 315 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698