chrome/browser/resources/options_resources.grd - Issue 2691943005: fix quick unlock config in options

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/resources/options_resources.grd

Issue 2691943005: fix quick unlock config in options (Closed)

Patch Set: set timeout 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:

View unified diff | Download patch

« chrome/browser/resources/options/i18n_setup.html ('K') | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/settings/people_page/lock_screen.js » ('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/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 142 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
153 flattenhtml="true" />	153 flattenhtml="true" />

154 <structure name="IDR_SETTINGS_PREFS_TYPES_HTML"	154 <structure name="IDR_SETTINGS_PREFS_TYPES_HTML"

155 file="settings/prefs/prefs_types.html"	155 file="settings/prefs/prefs_types.html"

156 type="chrome_html"	156 type="chrome_html"

157 flattenhtml="true"	157 flattenhtml="true"

158 allowexternalscript="true" />	158 allowexternalscript="true" />

159 <structure name="IDR_SETTINGS_PREFS_TYPES_JS"	159 <structure name="IDR_SETTINGS_PREFS_TYPES_JS"

160 file="settings/prefs/prefs_types.js"	160 file="settings/prefs/prefs_types.js"

161 type="chrome_html"	161 type="chrome_html"

162 flattenhtml="true" />	162 flattenhtml="true" />

	163 <structure name="IDR_SETTINGS_PREFS_HTML"

	164 file="settings/prefs/prefs.html"

	165 type="chrome_html"

	166 flattenhtml="true"

	167 allowexternalscript="true" />

	168 <structure name="IDR_SETTINGS_PREFS_JS"

	169 file="settings/prefs/prefs.js"

	170 type="chrome_html"

	171 flattenhtml="true" />

	172 <structure name="IDR_OPTIONS_I18N_SETUP_HTML"

	173 file="options/i18n_setup.html"

	174 type="chrome_html"

	175 flattenhtml="true"

	176 allowexternalscript="true" />

163 <structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML"	177 <structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML"

164 file="options/options_polymer.html"	178 file="options/options_polymer.html"

165 type="chrome_html"	179 type="chrome_html"

166 flattenhtml="true"	180 flattenhtml="true"

167 allowexternalscript="true" />	181 allowexternalscript="true" />

168 </if>	182 </if>

169 </structures>	183 </structures>

170 </release>	184 </release>

171 </grit>	185 </grit>

OLD	NEW