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

1166 allowexternalscript="true" />	1166 allowexternalscript="true" />

1167 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"	1167 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"

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

1169 type="chrome_html" />	1169 type="chrome_html" />

1170 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"	1170 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"

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

1172 type="chrome_html"	1172 type="chrome_html"

1173 flattenhtml="true"	1173 flattenhtml="true"

1174 allowexternalscript="true" />	1174 allowexternalscript="true" />

	1175 <structure name="IDR_SETTINGS_PEOPLE_FINGERPRINT_LIST_JS"

	1176 file="people_page/fingerprint_list.js"

	1177 type="chrome_html" />

	1178 <structure name="IDR_SETTINGS_PEOPLE_FINGERPRINT_LIST_HTML"

	1179 file="people_page/fingerprint_list.html"

	1180 type="chrome_html"

	1181 flattenhtml="true"

	1182 allowexternalscript="true" />

1175 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"	1183 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"

1176 file="people_page/pin_keyboard.js"	1184 file="people_page/pin_keyboard.js"

1177 type="chrome_html"	1185 type="chrome_html"

1178 flattenhtml="true" />	1186 flattenhtml="true" />

1179 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"	1187 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"

1180 file="people_page/users_add_user_dialog.js"	1188 file="people_page/users_add_user_dialog.js"

1181 type="chrome_html" />	1189 type="chrome_html" />

1182 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"	1190 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"

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

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

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

1198 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1206 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1199 file="people_page/users_page.html"	1207 file="people_page/users_page.html"

1200 type="chrome_html"	1208 type="chrome_html"

1201 flattenhtml="true"	1209 flattenhtml="true"

1202 allowexternalscript="true" />	1210 allowexternalscript="true" />

1203 </if>	1211 </if>

1204 </structures>	1212 </structures>

1205 </release>	1213 </release>

1206 </grit>	1214 </grit>

OLD	NEW