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

Side by Side Diff: chrome/browser/resources/options_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:

« no previous file with comments | « chrome/browser/resources/options/chromeos/quick_unlock_configure_overlay.js ('k') | chrome/browser/resources/settings/people_page/fingerprint_list.html » ('j') | chrome/browser/resources/settings/people_page/fingerprint_list.html » ('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/options_resources.h" type="rc_header">	4 <output filename="grit/options_resources.h" type="rc_header">

5 <emit emit_type='prepend'></emit>	5 <emit emit_type='prepend'></emit>

6 </output>	6 </output>

7 <output filename="options_resources.pak" type="data_package" />	7 <output filename="options_resources.pak" type="data_package" />

8 </outputs>	8 </outputs>

9 <release seq="1">	9 <release seq="1">

10 <structures>	10 <structures>

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 flattenhtml="true"	57 flattenhtml="true"

58 allowexternalscript="true" />	58 allowexternalscript="true" />

59 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_JS"	59 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_JS"

60 file="settings/people_page/setup_pin_dialog.js"	60 file="settings/people_page/setup_pin_dialog.js"

61 type="chrome_html" />	61 type="chrome_html" />

62 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_HTML"	62 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_HTML"

63 file="settings/people_page/setup_pin_dialog.html"	63 file="settings/people_page/setup_pin_dialog.html"

64 type="chrome_html"	64 type="chrome_html"

65 flattenhtml="true"	65 flattenhtml="true"

66 allowexternalscript="true" />	66 allowexternalscript="true" />

	67 <structure name="IDR_OPTIONS_FINGERPRINT_LIST_JS"

	68 file="settings/people_page/fingerprint_list.js"

	69 type="chrome_html" />

	70 <structure name="IDR_OPTIONS_FINGERPRINT_LIST_HTML"

	71 file="settings/people_page/fingerprint_list.html"

	72 type="chrome_html"

	73 flattenhtml="true"
	Dan Beam 2017/01/10 23:23:45 why do you need flattenhtml="true"? why do you need flattenhtml="true"? sammiequon 2017/01/11 00:29:09 What do flattenhtml and allowexternalscript do? Th Show quoted text On 2017/01/10 23:23:45, Dan Beam wrote: > why do you need flattenhtml="true"? What do flattenhtml and allowexternalscript do? Thanks!
	74 allowexternalscript="true" />

67 <structure name="IDR_OPTIONS_LOCK_SCREEN_JS"	75 <structure name="IDR_OPTIONS_LOCK_SCREEN_JS"

68 file="settings/people_page/lock_screen.js"	76 file="settings/people_page/lock_screen.js"

69 type="chrome_html" />	77 type="chrome_html" />

70 <structure name="IDR_OPTIONS_LOCK_SCREEN_HTML"	78 <structure name="IDR_OPTIONS_LOCK_SCREEN_HTML"

71 file="settings/people_page/lock_screen.html"	79 file="settings/people_page/lock_screen.html"

72 type="chrome_html"	80 type="chrome_html"

73 flattenhtml="true"	81 flattenhtml="true"

74 allowexternalscript="true" />	82 allowexternalscript="true" />

75 <structure name="IDR_OPTIONS_ROUTE_HTML"	83 <structure name="IDR_OPTIONS_ROUTE_HTML"

76 file="settings/route.html"	84 file="settings/route.html"

(...skipping 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111 flattenhtml="true" />	119 flattenhtml="true" />

112 <structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML"	120 <structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML"

113 file="options/options_polymer.html"	121 file="options/options_polymer.html"

114 type="chrome_html"	122 type="chrome_html"

115 flattenhtml="true"	123 flattenhtml="true"

116 allowexternalscript="true" />	124 allowexternalscript="true" />

117 </if>	125 </if>

118 </structures>	126 </structures>

119 </release>	127 </release>

120 </grit>	128 </grit>

OLD	NEW