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

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: Rebase 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
« chrome/browser/resources/settings/people_page/lock_screen.js ('K') | « 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 1029 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 flattenhtml="true" 1040 flattenhtml="true"
1041 allowexternalscript="true" /> 1041 allowexternalscript="true" />
1042 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_JS" 1042 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_JS"
1043 file="people_page/easy_unlock_turn_off_dialog.js" 1043 file="people_page/easy_unlock_turn_off_dialog.js"
1044 type="chrome_html" /> 1044 type="chrome_html" />
1045 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_HTML" 1045 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_HTML"
1046 file="people_page/easy_unlock_turn_off_dialog.html" 1046 file="people_page/easy_unlock_turn_off_dialog.html"
1047 type="chrome_html" 1047 type="chrome_html"
1048 flattenhtml="true" 1048 flattenhtml="true"
1049 allowexternalscript="true" /> 1049 allowexternalscript="true" />
1050 <structure name="IDR_SETTINGS_PIN_KEYBOARD_HTML" 1050 <structure name="IDR_SETTINGS_PEOPLE_PASSWORD_PROMPT_DIALOG_JS"
1051 file="people_page/password_prompt_dialog.js"
1052 type="chrome_html" />
1053 <structure name="IDR_SETTINGS_PEOPLE_PASSWORD_PROMPT_DIALOG_HTML"
1054 file="people_page/password_prompt_dialog.html"
1055 type="chrome_html"
1056 flattenhtml="true"
1057 allowexternalscript="true" />
1058 <structure name="IDR_SETTINGS_PEOPLE_PIN_KEYBOARD_HTML"
1051 file="people_page/pin_keyboard.html" 1059 file="people_page/pin_keyboard.html"
1052 type="chrome_html" 1060 type="chrome_html"
1053 flattenhtml="true" 1061 flattenhtml="true"
1054 allowexternalscript="true"/> 1062 allowexternalscript="true"/>
1055 <structure name="IDR_SETTINGS_QUICK_UNLOCK_AUTHENTICATE_JS" 1063 <structure name="IDR_SETTINGS_PEOPLE_LOCK_SCREEN_JS"
1056 file="people_page/quick_unlock_authenticate.js" 1064 file="people_page/lock_screen.js"
1057 type="chrome_html" /> 1065 type="chrome_html" />
1058 <structure name="IDR_SETTINGS_QUICK_UNLOCK_AUTHENTICATE_HTML" 1066 <structure name="IDR_SETTINGS_PEOPLE_LOCK_SCREEN_HTML"
1059 file="people_page/quick_unlock_authenticate.html" 1067 file="people_page/lock_screen.html"
1060 type="chrome_html" 1068 type="chrome_html"
1061 flattenhtml="true" 1069 flattenhtml="true"
1062 allowexternalscript="true" /> 1070 allowexternalscript="true" />
1063 <structure name="IDR_SETTINGS_QUICK_UNLOCK_CHOOSE_METHOD_JS" 1071 <structure name="IDR_SETTINGS_PEOPLE_LOCK_STATE_BEHAVIOR_JS"
1064 file="people_page/quick_unlock_choose_method.js" 1072 file="people_page/lock_state_behavior.js"
1065 type="chrome_html" /> 1073 type="chrome_html" />
1066 <structure name="IDR_SETTINGS_QUICK_UNLOCK_CHOOSE_METHOD_HTML" 1074 <structure name="IDR_SETTINGS_PEOPLE_LOCK_STATE_BEHAVIOR_HTML"
1067 file="people_page/quick_unlock_choose_method.html" 1075 file="people_page/lock_state_behavior.html"
1068 type="chrome_html" 1076 type="chrome_html"
1069 flattenhtml="true" 1077 flattenhtml="true"
1070 allowexternalscript="true" /> 1078 allowexternalscript="true" />
1071 <structure name="IDR_SETTINGS_QUICK_UNLOCK_SETUP_PIN_JS" 1079 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"
1072 file="people_page/quick_unlock_setup_pin.js" 1080 file="people_page/setup_pin_dialog.js"
1073 type="chrome_html" /> 1081 type="chrome_html" />
1074 <structure name="IDR_SETTINGS_QUICK_UNLOCK_SETUP_PIN_HTML" 1082 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"
1075 file="people_page/quick_unlock_setup_pin.html" 1083 file="people_page/setup_pin_dialog.html"
1076 type="chrome_html" 1084 type="chrome_html"
1077 flattenhtml="true" 1085 flattenhtml="true"
1078 allowexternalscript="true" /> 1086 allowexternalscript="true" />
1079 <structure name="IDR_SETTINGS_QUICK_UNLOCK_PASSWORD_DETECT_BEHAVIOR_JS"
1080 file="people_page/quick_unlock_password_detect_behavior.js"
1081 type="chrome_html" />
1082 <structure name="IDR_SETTINGS_QUICK_UNLOCK_PASSWORD_DETECT_BEHAVIOR_HTML "
1083 file="people_page/quick_unlock_password_detect_behavior.html"
1084 type="chrome_html"
1085 flattenhtml="true"
1086 allowexternalscript="true" />
1087 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS" 1087 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"
1088 file="people_page/pin_keyboard.js" 1088 file="people_page/pin_keyboard.js"
1089 type="chrome_html" 1089 type="chrome_html"
1090 flattenhtml="true" /> 1090 flattenhtml="true" />
1091 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS" 1091 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"
1092 file="people_page/users_add_user_dialog.js" 1092 file="people_page/users_add_user_dialog.js"
1093 type="chrome_html" /> 1093 type="chrome_html" />
1094 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML" 1094 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"
1095 file="people_page/users_add_user_dialog.html" 1095 file="people_page/users_add_user_dialog.html"
1096 type="chrome_html" 1096 type="chrome_html"
(...skipping 12 matching lines...) Expand all
1109 type="chrome_html" /> 1109 type="chrome_html" />
1110 <structure name="IDR_SETTINGS_USERS_PAGE_HTML" 1110 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"
1111 file="people_page/users_page.html" 1111 file="people_page/users_page.html"
1112 type="chrome_html" 1112 type="chrome_html"
1113 flattenhtml="true" 1113 flattenhtml="true"
1114 allowexternalscript="true" /> 1114 allowexternalscript="true" />
1115 </if> 1115 </if>
1116 </structures> 1116 </structures>
1117 </release> 1117 </release>
1118 </grit> 1118 </grit>
OLDNEW
« chrome/browser/resources/settings/people_page/lock_screen.js ('K') | « 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