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 22 errors. Created 3 years, 10 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:

« chrome/browser/resources/settings/people_page/fingerprint_list.js ('K') | « chrome/browser/resources/settings/people_page/people_page.js ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »
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 1163 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1174 flattenhtml="true"	1174 flattenhtml="true"

1175 allowexternalscript="true" />	1175 allowexternalscript="true" />

1176 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"	1176 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"

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

1178 type="chrome_html" />	1178 type="chrome_html" />

1179 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"	1179 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"

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

1181 type="chrome_html"	1181 type="chrome_html"

1182 flattenhtml="true"	1182 flattenhtml="true"

1183 allowexternalscript="true" />	1183 allowexternalscript="true" />

	1184 <structure name="IDR_SETTINGS_PEOPLE_FINGERPRINT_LIST_JS"

	1185 file="people_page/fingerprint_list.js"

	1186 type="chrome_html" />

	1187 <structure name="IDR_SETTINGS_PEOPLE_FINGERPRINT_LIST_HTML"

	1188 file="people_page/fingerprint_list.html"

	1189 type="chrome_html" />

1184 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"	1190 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"

1185 file="people_page/pin_keyboard.js"	1191 file="people_page/pin_keyboard.js"

1186 type="chrome_html"	1192 type="chrome_html"

1187 flattenhtml="true" />	1193 flattenhtml="true" />

1188 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"	1194 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"

1189 file="people_page/users_add_user_dialog.js"	1195 file="people_page/users_add_user_dialog.js"

1190 type="chrome_html" />	1196 type="chrome_html" />

1191 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"	1197 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"

1192 file="people_page/users_add_user_dialog.html"	1198 file="people_page/users_add_user_dialog.html"

1193 type="chrome_html"	1199 type="chrome_html"

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

1207 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1213 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1208 file="people_page/users_page.html"	1214 file="people_page/users_page.html"

1209 type="chrome_html"	1215 type="chrome_html"

1210 flattenhtml="true"	1216 flattenhtml="true"

1211 allowexternalscript="true" />	1217 allowexternalscript="true" />

1212 </if>	1218 </if>

1213 </structures>	1219 </structures>

1214 </release>	1220 </release>

1215 </grit>	1221 </grit>

OLD	NEW