chrome/browser/resources/settings/settings_resources.grd - Issue 2538303002: md-settings: Added settings for fingerprint unlock.

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

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)

Patch Set: Fixed patch set 1 errors. Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« chrome/browser/resources/settings/people_page/lock_screen.js ('K') | « chrome/browser/resources/settings/people_page/lock_screen.js ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | chrome/common/chrome_features.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 1138 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1149 flattenhtml="true"	1149 flattenhtml="true"

1150 allowexternalscript="true" />	1150 allowexternalscript="true" />

1151 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"	1151 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"

1152 file="people_page/setup_pin_dialog.js"	1152 file="people_page/setup_pin_dialog.js"

1153 type="chrome_html" />	1153 type="chrome_html" />

1154 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"	1154 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"

1155 file="people_page/setup_pin_dialog.html"	1155 file="people_page/setup_pin_dialog.html"

1156 type="chrome_html"	1156 type="chrome_html"

1157 flattenhtml="true"	1157 flattenhtml="true"

1158 allowexternalscript="true" />	1158 allowexternalscript="true" />

	1159 <structure name="IDR_SETTINGS_PEOPLE_FINGERPRINT_LIST_JS"

	1160 file="people_page/fingerprint_list.js"

	1161 type="chrome_html" />

	1162 <structure name="IDR_SETTINGS_PEOPLE_FINGERPRINT_LIST_HTML"

	1163 file="people_page/fingerprint_list.html"

	1164 type="chrome_html"

	1165 flattenhtml="true"

	1166 allowexternalscript="true" />

1159 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"	1167 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"

1160 file="people_page/pin_keyboard.js"	1168 file="people_page/pin_keyboard.js"

1161 type="chrome_html"	1169 type="chrome_html"

1162 flattenhtml="true" />	1170 flattenhtml="true" />

1163 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"	1171 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"

1164 file="people_page/users_add_user_dialog.js"	1172 file="people_page/users_add_user_dialog.js"

1165 type="chrome_html" />	1173 type="chrome_html" />

1166 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"	1174 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"

1167 file="people_page/users_add_user_dialog.html"	1175 file="people_page/users_add_user_dialog.html"

1168 type="chrome_html"	1176 type="chrome_html"

(...skipping 12 matching lines...) Expand all Loading...
1181 type="chrome_html" />	1189 type="chrome_html" />

1182 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1190 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1183 file="people_page/users_page.html"	1191 file="people_page/users_page.html"

1184 type="chrome_html"	1192 type="chrome_html"

1185 flattenhtml="true"	1193 flattenhtml="true"

1186 allowexternalscript="true" />	1194 allowexternalscript="true" />

1187 </if>	1195 </if>

1188 </structures>	1196 </structures>

1189 </release>	1197 </release>

1190 </grit>	1198 </grit>

OLD	NEW