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: Modified the flags. 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/lock_screen.html ('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 1167 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1178 flattenhtml="true"	1178 flattenhtml="true"

1179 allowexternalscript="true" />	1179 allowexternalscript="true" />

1180 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"	1180 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"

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

1182 type="chrome_html" />	1182 type="chrome_html" />

1183 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"	1183 <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"

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

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

1186 flattenhtml="true"	1186 flattenhtml="true"

1187 allowexternalscript="true" />	1187 allowexternalscript="true" />

	1188 <structure name="IDR_SETTINGS_PEOPLE_FINGERPRINT_LIST_JS"

	1189 file="people_page/fingerprint_list.js"

	1190 type="chrome_html" />

	1191 <structure name="IDR_SETTINGS_PEOPLE_FINGERPRINT_LIST_HTML"

	1192 file="people_page/fingerprint_list.html"

	1193 type="chrome_html"

	1194 flattenhtml="true"

	1195 allowexternalscript="true" />
	Dan Beam 2017/01/10 23:23:46 i think you can remove flattenhtml="true" and allo i think you can remove flattenhtml="true" and allowexternalscript="true" sammiequon 2017/01/11 00:29:09 Done. Show quoted text On 2017/01/10 23:23:46, Dan Beam wrote: > i think you can remove flattenhtml="true" and allowexternalscript="true" Done.
1188 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"	1196 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"

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

1190 type="chrome_html"	1198 type="chrome_html"

1191 flattenhtml="true" />	1199 flattenhtml="true" />

1192 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"	1200 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"

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

1194 type="chrome_html" />	1202 type="chrome_html" />

1195 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"	1203 <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"

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

1197 type="chrome_html"	1205 type="chrome_html"

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

1211 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1219 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

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

1213 type="chrome_html"	1221 type="chrome_html"

1214 flattenhtml="true"	1222 flattenhtml="true"

1215 allowexternalscript="true" />	1223 allowexternalscript="true" />

1216 </if>	1224 </if>

1217 </structures>	1225 </structures>

1218 </release>	1226 </release>

1219 </grit>	1227 </grit>

OLD	NEW