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

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

Issue 2091143002: Add the authenticate screen for the quick unlock settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pin-unlock-settings-keyboard-fixes
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 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_HTML" 898 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_HTML"
899 file="people_page/easy_unlock_turn_off_dialog.html" 899 file="people_page/easy_unlock_turn_off_dialog.html"
900 type="chrome_html" 900 type="chrome_html"
901 flattenhtml="true" 901 flattenhtml="true"
902 allowexternalscript="true" /> 902 allowexternalscript="true" />
903 <structure name="IDR_SETTINGS_PIN_KEYBOARD_HTML" 903 <structure name="IDR_SETTINGS_PIN_KEYBOARD_HTML"
904 file="people_page/pin_keyboard.html" 904 file="people_page/pin_keyboard.html"
905 type="chrome_html" 905 type="chrome_html"
906 flattenhtml="true" 906 flattenhtml="true"
907 allowexternalscript="true"/> 907 allowexternalscript="true"/>
908 <structure name="IDR_SETTINGS_QUICK_UNLOCK_AUTHENTICATE_JS"
909 file="people_page/quick_unlock_authenticate.js"
910 type="chrome_html" />
911 <structure name="IDR_SETTINGS_QUICK_UNLOCK_AUTHENTICATE_HTML"
912 file="people_page/quick_unlock_authenticate.html"
913 type="chrome_html"
914 flattenhtml="true"
915 allowexternalscript="true" />
916 <structure name="IDR_SETTINGS_QUICK_UNLOCK_ROUTING_BEHAVIOR_JS"
917 file="people_page/quick_unlock_routing_behavior.js"
918 type="chrome_html" />
919 <structure name="IDR_SETTINGS_QUICK_UNLOCK_ROUTING_BEHAVIOR_HTML"
920 file="people_page/quick_unlock_routing_behavior.html"
921 type="chrome_html"
922 flattenhtml="true"
923 allowexternalscript="true" />
908 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS" 924 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"
909 file="people_page/pin_keyboard.js" 925 file="people_page/pin_keyboard.js"
910 type="chrome_html" 926 type="chrome_html"
911 flattenhtml="true" /> 927 flattenhtml="true" />
912 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS" 928 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"
913 file="people_page/users_add_user_dialog.js" 929 file="people_page/users_add_user_dialog.js"
914 type="chrome_html" /> 930 type="chrome_html" />
915 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML" 931 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"
916 file="people_page/users_add_user_dialog.html" 932 file="people_page/users_add_user_dialog.html"
917 type="chrome_html" 933 type="chrome_html"
(...skipping 12 matching lines...) Expand all
930 type="chrome_html" /> 946 type="chrome_html" />
931 <structure name="IDR_SETTINGS_USERS_PAGE_HTML" 947 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"
932 file="people_page/users_page.html" 948 file="people_page/users_page.html"
933 type="chrome_html" 949 type="chrome_html"
934 flattenhtml="true" 950 flattenhtml="true"
935 allowexternalscript="true" /> 951 allowexternalscript="true" />
936 </if> 952 </if>
937 </structures> 953 </structures>
938 </release> 954 </release>
939 </grit> 955 </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