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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2208473007: Rework quick unlock settings to follow new specs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Fix closure (bad merge) Created 4 years, 4 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/route.js ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('j') | 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" output_all_resource_defines= "false"> 2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">
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 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
1026 flattenhtml="true" 1026 flattenhtml="true"
1027 allowexternalscript="true" /> 1027 allowexternalscript="true" />
1028 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_JS" 1028 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_JS"
1029 file="people_page/easy_unlock_turn_off_dialog.js" 1029 file="people_page/easy_unlock_turn_off_dialog.js"
1030 type="chrome_html" /> 1030 type="chrome_html" />
1031 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_HTML" 1031 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_HTML"
1032 file="people_page/easy_unlock_turn_off_dialog.html" 1032 file="people_page/easy_unlock_turn_off_dialog.html"
1033 type="chrome_html" 1033 type="chrome_html"
1034 flattenhtml="true" 1034 flattenhtml="true"
1035 allowexternalscript="true" /> 1035 allowexternalscript="true" />
1036 <structure name="IDR_SETTINGS_PIN_KEYBOARD_HTML" 1036 <structure name="IDR_SETTINGS_PEOPLE_PASSWORD_PROMPT_DIALOG_JS"
1037 file="people_page/password_prompt_dialog.js"
1038 type="chrome_html" />
1039 <structure name="IDR_SETTINGS_PEOPLE_PASSWORD_PROMPT_DIALOG_HTML"
1040 file="people_page/password_prompt_dialog.html"
1041 type="chrome_html"
1042 flattenhtml="true"
1043 allowexternalscript="true" />
1044 <structure name="IDR_SETTINGS_PEOPLE_PIN_KEYBOARD_HTML"
1037 file="people_page/pin_keyboard.html" 1045 file="people_page/pin_keyboard.html"
1038 type="chrome_html" 1046 type="chrome_html"
1039 flattenhtml="true" 1047 flattenhtml="true"
1040 allowexternalscript="true"/> 1048 allowexternalscript="true"/>
1041 <structure name="IDR_SETTINGS_QUICK_UNLOCK_AUTHENTICATE_JS" 1049 <structure name="IDR_SETTINGS_PEOPLE_LOCK_SCREEN_JS"
1042 file="people_page/quick_unlock_authenticate.js" 1050 file="people_page/lock_screen.js"
1043 type="chrome_html" /> 1051 type="chrome_html" />
1044 <structure name="IDR_SETTINGS_QUICK_UNLOCK_AUTHENTICATE_HTML" 1052 <structure name="IDR_SETTINGS_PEOPLE_LOCK_SCREEN_HTML"
1045 file="people_page/quick_unlock_authenticate.html" 1053 file="people_page/lock_screen.html"
1046 type="chrome_html" 1054 type="chrome_html"
1047 flattenhtml="true" 1055 flattenhtml="true"
1048 allowexternalscript="true" /> 1056 allowexternalscript="true" />
1049 <structure name="IDR_SETTINGS_QUICK_UNLOCK_CHOOSE_METHOD_JS" 1057 <structure name="IDR_SETTINGS_PEOPLE_LOCK_STATE_BEHAVIOR_JS"
1050 file="people_page/quick_unlock_choose_method.js" 1058 file="people_page/lock_state_behavior.js"
1051 type="chrome_html" /> 1059 type="chrome_html" />
1052 <structure name="IDR_SETTINGS_QUICK_UNLOCK_CHOOSE_METHOD_HTML" 1060 <structure name="IDR_SETTINGS_PEOPLE_LOCK_STATE_BEHAVIOR_HTML"
1053 file="people_page/quick_unlock_choose_method.html" 1061 file="people_page/lock_state_behavior.html"
1054 type="chrome_html" 1062 type="chrome_html"
1055 flattenhtml="true" 1063 flattenhtml="true"
1056 allowexternalscript="true" /> 1064 allowexternalscript="true" />
1057 <structure name="IDR_SETTINGS_QUICK_UNLOCK_SETUP_PIN_JS" 1065 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"
1058 file="people_page/quick_unlock_setup_pin.js" 1066 file="people_page/setup_pin_dialog.js"
1059 type="chrome_html" /> 1067 type="chrome_html" />
1060 <structure name="IDR_SETTINGS_QUICK_UNLOCK_SETUP_PIN_HTML" 1068 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"
1061 file="people_page/quick_unlock_setup_pin.html" 1069 file="people_page/setup_pin_dialog.html"
1062 type="chrome_html" 1070 type="chrome_html"
1063 flattenhtml="true" 1071 flattenhtml="true"
1064 allowexternalscript="true" /> 1072 allowexternalscript="true" />
1065 <structure name="IDR_SETTINGS_QUICK_UNLOCK_PASSWORD_DETECT_BEHAVIOR_JS"
1066 file="people_page/quick_unlock_password_detect_behavior.js"
1067 type="chrome_html" />
1068 <structure name="IDR_SETTINGS_QUICK_UNLOCK_PASSWORD_DETECT_BEHAVIOR_HTML "
1069 file="people_page/quick_unlock_password_detect_behavior.html"
1070 type="chrome_html"
1071 flattenhtml="true"
1072 allowexternalscript="true" />
1073 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS" 1073 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"
1074 file="people_page/pin_keyboard.js" 1074 file="people_page/pin_keyboard.js"
1075 type="chrome_html" 1075 type="chrome_html"
1076 flattenhtml="true" /> 1076 flattenhtml="true" />
1077 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS" 1077 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"
1078 file="people_page/users_add_user_dialog.js" 1078 file="people_page/users_add_user_dialog.js"
1079 type="chrome_html" /> 1079 type="chrome_html" />
1080 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML" 1080 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"
1081 file="people_page/users_add_user_dialog.html" 1081 file="people_page/users_add_user_dialog.html"
1082 type="chrome_html" 1082 type="chrome_html"
(...skipping 12 matching lines...) Expand all
1095 type="chrome_html" /> 1095 type="chrome_html" />
1096 <structure name="IDR_SETTINGS_USERS_PAGE_HTML" 1096 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"
1097 file="people_page/users_page.html" 1097 file="people_page/users_page.html"
1098 type="chrome_html" 1098 type="chrome_html"
1099 flattenhtml="true" 1099 flattenhtml="true"
1100 allowexternalscript="true" /> 1100 allowexternalscript="true" />
1101 </if> 1101 </if>
1102 </structures> 1102 </structures>
1103 </release> 1103 </release>
1104 </grit> 1104 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/route.js ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698