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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/settings/settings_resources.grd

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
« no previous file with comments | « chrome/browser/resources/settings/settings_page/settings_router.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/settings_resources.h" type="rc_header"> 4 <output filename="grit/settings_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/settings_resources_map.cc" 7 <output filename="grit/settings_resources_map.cc"
8 type="resource_file_map_source" /> 8 type="resource_file_map_source" />
9 <output filename="grit/settings_resources_map.h" 9 <output filename="grit/settings_resources_map.h"
10 type="resource_map_header" /> 10 type="resource_map_header" />
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 flattenhtml="true" 958 flattenhtml="true"
959 allowexternalscript="true"/> 959 allowexternalscript="true"/>
960 <structure name="IDR_SETTINGS_QUICK_UNLOCK_AUTHENTICATE_JS" 960 <structure name="IDR_SETTINGS_QUICK_UNLOCK_AUTHENTICATE_JS"
961 file="people_page/quick_unlock_authenticate.js" 961 file="people_page/quick_unlock_authenticate.js"
962 type="chrome_html" /> 962 type="chrome_html" />
963 <structure name="IDR_SETTINGS_QUICK_UNLOCK_AUTHENTICATE_HTML" 963 <structure name="IDR_SETTINGS_QUICK_UNLOCK_AUTHENTICATE_HTML"
964 file="people_page/quick_unlock_authenticate.html" 964 file="people_page/quick_unlock_authenticate.html"
965 type="chrome_html" 965 type="chrome_html"
966 flattenhtml="true" 966 flattenhtml="true"
967 allowexternalscript="true" /> 967 allowexternalscript="true" />
968 <structure name="IDR_SETTINGS_QUICK_UNLOCK_CHOOSE_METHOD_JS"
969 file="people_page/quick_unlock_choose_method.js"
970 type="chrome_html" />
971 <structure name="IDR_SETTINGS_QUICK_UNLOCK_CHOOSE_METHOD_HTML"
972 file="people_page/quick_unlock_choose_method.html"
973 type="chrome_html"
974 flattenhtml="true"
975 allowexternalscript="true" />
968 <structure name="IDR_SETTINGS_QUICK_UNLOCK_ROUTING_BEHAVIOR_JS" 976 <structure name="IDR_SETTINGS_QUICK_UNLOCK_ROUTING_BEHAVIOR_JS"
969 file="people_page/quick_unlock_routing_behavior.js" 977 file="people_page/quick_unlock_routing_behavior.js"
970 type="chrome_html" /> 978 type="chrome_html" />
971 <structure name="IDR_SETTINGS_QUICK_UNLOCK_ROUTING_BEHAVIOR_HTML" 979 <structure name="IDR_SETTINGS_QUICK_UNLOCK_ROUTING_BEHAVIOR_HTML"
972 file="people_page/quick_unlock_routing_behavior.html" 980 file="people_page/quick_unlock_routing_behavior.html"
973 type="chrome_html" 981 type="chrome_html"
974 flattenhtml="true" 982 flattenhtml="true"
975 allowexternalscript="true" /> 983 allowexternalscript="true" />
984 <structure name="IDR_SETTINGS_QUICK_UNLOCK_PASSWORD_DETECT_BEHAVIOR_JS"
985 file="people_page/quick_unlock_password_detect_behavior.js"
986 type="chrome_html" />
987 <structure name="IDR_SETTINGS_QUICK_UNLOCK_PASSWORD_DETECT_BEHAVIOR_HTML "
988 file="people_page/quick_unlock_password_detect_behavior.html"
989 type="chrome_html"
990 flattenhtml="true"
991 allowexternalscript="true" />
976 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS" 992 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"
977 file="people_page/pin_keyboard.js" 993 file="people_page/pin_keyboard.js"
978 type="chrome_html" 994 type="chrome_html"
979 flattenhtml="true" /> 995 flattenhtml="true" />
980 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS" 996 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"
981 file="people_page/users_add_user_dialog.js" 997 file="people_page/users_add_user_dialog.js"
982 type="chrome_html" /> 998 type="chrome_html" />
983 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML" 999 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"
984 file="people_page/users_add_user_dialog.html" 1000 file="people_page/users_add_user_dialog.html"
985 type="chrome_html" 1001 type="chrome_html"
(...skipping 12 matching lines...) Expand all
998 type="chrome_html" /> 1014 type="chrome_html" />
999 <structure name="IDR_SETTINGS_USERS_PAGE_HTML" 1015 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"
1000 file="people_page/users_page.html" 1016 file="people_page/users_page.html"
1001 type="chrome_html" 1017 type="chrome_html"
1002 flattenhtml="true" 1018 flattenhtml="true"
1003 allowexternalscript="true" /> 1019 allowexternalscript="true" />
1004 </if> 1020 </if>
1005 </structures> 1021 </structures>
1006 </release> 1022 </release>
1007 </grit> 1023 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/settings_page/settings_router.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698