chrome/browser/resources/options_resources.grd - Issue 2236213002: Add quick unlock Settings in options page

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

Issue 2236213002: Add quick unlock Settings in options page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: incorporate comments from jdufault@ Created 4 years, 4 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/route_stub.js ('K') | « chrome/browser/resources/options/sync_section.html ('k') | chrome/browser/resources/settings/people_page/compiled_resources2.gyp » ('j') | chrome/browser/resources/settings/people_page/lock_screen.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>

11 <structure name="IDR_OPTIONS_BUNDLE_JS"	11 <structure name="IDR_OPTIONS_BUNDLE_JS"

12 file="options/options_bundle.js"	12 file="options/options_bundle.js"

13 flattenhtml="true"	13 flattenhtml="true"

14 type="chrome_html" />	14 type="chrome_html" />

15 <structure name="IDR_OPTIONS_HTML"	15 <structure name="IDR_OPTIONS_HTML"

16 file="options/options.html"	16 file="options/options.html"

17 flattenhtml="true"	17 flattenhtml="true"

18 allowexternalscript="true"	18 allowexternalscript="true"

19 type="chrome_html" />	19 type="chrome_html" />

	20 <structure name="IDR_OPTIONS_PIN_KEYBOARD_HTML"
	xiyuan 2016/08/16 18:19:47 Can we only include them for chromeos build? Can we only include them for chromeos build? xiaoyinh(OOO Sep 11-29) 2016/08/17 20:52:11 Done. Show quoted text On 2016/08/16 18:19:47, xiyuan wrote: > Can we only include them for chromeos build? Done.
	21 file="chromeos/quick_unlock/pin_keyboard.html"

	22 type="chrome_html"

	23 flattenhtml="true"

	24 allowexternalscript="true" />

	25 <structure name="IDR_OPTIONS_PIN_KEYBOARD_JS"

	26 file="chromeos/quick_unlock/pin_keyboard.js"

	27 type="chrome_html"

	28 flattenhtml="true" />

	29 <structure name="IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS"

	30 file="settings/people_page/password_prompt_dialog.js"

	31 type="chrome_html" />

	32 <structure name="IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_HTML"

	33 file="settings/people_page/password_prompt_dialog.html"

	34 type="chrome_html"

	35 flattenhtml="true"

	36 allowexternalscript="true" />

	37 <structure name="IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS"

	38 file="settings/people_page/lock_state_behavior.js"

	39 type="chrome_html" />

	40 <structure name="IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML"

	41 file="settings/people_page/lock_state_behavior.html"

	42 type="chrome_html"

	43 flattenhtml="true"

	44 allowexternalscript="true" />

	45 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_JS"

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

	47 type="chrome_html" />

	48 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_HTML"

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

	50 type="chrome_html"

	51 flattenhtml="true"

	52 allowexternalscript="true" />

	53 <structure name="IDR_OPTIONS_LOCK_SCREEN_JS"

	54 file="settings/people_page/lock_screen.js"

	55 type="chrome_html" />

	56 <structure name="IDR_OPTIONS_LOCK_SCREEN_HTML"

	57 file="settings/people_page/lock_screen.html"

	58 type="chrome_html"

	59 flattenhtml="true"

	60 allowexternalscript="true" />

	61 <structure name="IDR_OPTIONS_ROUTE_HTML"

	62 file="options/route_stub.html"

	63 type="chrome_html"

	64 flattenhtml="true"

	65 allowexternalscript="true" />

	66 <structure name="IDR_OPTIONS_ROUTE_JS"

	67 file="options/route_stub.js"

	68 type="chrome_html"

	69 flattenhtml="true" />

	70 <structure name="IDR_SETTINGS_SHARED_CSS_HTML"

	71 file="settings/settings_shared_css.html"

	72 type="chrome_html"

	73 flattenhtml="true"

	74 allowexternalscript="true" />

	75 <structure name="IDR_SETTINGS_VARS_CSS_HTML"

	76 file="settings/settings_vars_css.html"

	77 type="chrome_html"

	78 flattenhtml="true"

	79 allowexternalscript="true" />

	80 <structure name="IDR_SETTINGS_PREFS_BEHAVIOR_HTML"

	81 file="settings/prefs/prefs_behavior.html"

	82 type="chrome_html"

	83 flattenhtml="true"

	84 allowexternalscript="true" />

	85 <structure name="IDR_SETTINGS_PREFS_BEHAVIOR_JS"

	86 file="settings/prefs/prefs_behavior.js"

	87 type="chrome_html"

	88 flattenhtml="true" />

	89 <structure name="IDR_SETTINGS_PREFS_TYPES_HTML"

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

	91 type="chrome_html"

	92 flattenhtml="true"

	93 allowexternalscript="true" />

	94 <structure name="IDR_SETTINGS_PREFS_TYPES_JS"

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

	96 type="chrome_html"

	97 flattenhtml="true" />

20 </structures>	98 </structures>

21 </release>	99 </release>

22 </grit>	100 </grit>

OLD	NEW