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: Rebased. Created 3 years, 11 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 1161 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1172 flattenhtml="true"	1172 flattenhtml="true"

1173 allowexternalscript="true" />	1173 allowexternalscript="true" />

1174 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"	1174 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"

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

1176 type="chrome_html" />	1176 type="chrome_html" />

1177 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"	1177 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"

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

1179 type="chrome_html"	1179 type="chrome_html"

1180 flattenhtml="true"	1180 flattenhtml="true"

1181 allowexternalscript="true" />	1181 allowexternalscript="true" />

	1182 <structure name="IDR_SETTINGS_PEOPLE_FINGERPRINT_LIST_JS"

	1183 file="people_page/fingerprint_list.js"

	1184 type="chrome_html" />

	1185 <structure name="IDR_SETTINGS_PEOPLE_FINGERPRINT_LIST_HTML"

	1186 file="people_page/fingerprint_list.html"

	1187 type="chrome_html" />

1182 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"	1188 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"

1183 file="people_page/pin_keyboard.js"	1189 file="people_page/pin_keyboard.js"

1184 type="chrome_html"	1190 type="chrome_html"

1185 flattenhtml="true" />	1191 flattenhtml="true" />

1186 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"	1192 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"

1187 file="people_page/users_add_user_dialog.js"	1193 file="people_page/users_add_user_dialog.js"

1188 type="chrome_html" />	1194 type="chrome_html" />

1189 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"	1195 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"

1190 file="people_page/users_add_user_dialog.html"	1196 file="people_page/users_add_user_dialog.html"

1191 type="chrome_html"	1197 type="chrome_html"

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

1205 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1211 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1206 file="people_page/users_page.html"	1212 file="people_page/users_page.html"

1207 type="chrome_html"	1213 type="chrome_html"

1208 flattenhtml="true"	1214 flattenhtml="true"

1209 allowexternalscript="true" />	1215 allowexternalscript="true" />

1210 </if>	1216 </if>

1211 </structures>	1217 </structures>

1212 </release>	1218 </release>

1213 </grit>	1219 </grit>

OLD	NEW