chrome/browser/resources/options_resources.grd - Issue 2787153002: MD Settings: Move easy unlock from people to lock screen.

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

Issue 2787153002: MD Settings: Move easy unlock from people to lock screen. (Closed)

Patch Set: Closure. Created 3 years, 8 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/compiled_resources.gyp ('k') | chrome/browser/resources/settings/people_page/compiled_resources2.gyp » ('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 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47 type="chrome_html" />	47 type="chrome_html" />

48 <structure name="IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML"	48 <structure name="IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML"

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

50 type="chrome_html" />	50 type="chrome_html" />

51 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_JS"	51 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_JS"

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

53 type="chrome_html" />	53 type="chrome_html" />

54 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_HTML"	54 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_HTML"

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

56 type="chrome_html" />	56 type="chrome_html" />

	57 <structure name="IDR_OPTIONS_EASY_UNLOCK_BROWSER_PROXY_JS"

	58 file="settings/people_page/easy_unlock_browser_proxy.js"

	59 type="chrome_html" />

	60 <structure name="IDR_OPTIONS_EASY_UNLOCK_BROWSER_PROXY_HTML"

	61 file="settings/people_page/easy_unlock_browser_proxy.html"

	62 type="chrome_html" />

	63 <structure name="IDR_OPTIONS_EASY_UNLOCK_TURN_OFF_DIALOG_JS"

	64 file="settings/people_page/easy_unlock_turn_off_dialog.js"

	65 type="chrome_html" />

	66 <structure name="IDR_OPTIONS_EASY_UNLOCK_TURN_OFF_DIALOG_HTML"

	67 file="settings/people_page/easy_unlock_turn_off_dialog.html"

	68 type="chrome_html" />

57 <structure name="IDR_OPTIONS_FINGERPRINT_LIST_JS"	69 <structure name="IDR_OPTIONS_FINGERPRINT_LIST_JS"

58 file="settings/people_page/fingerprint_list.js"	70 file="settings/people_page/fingerprint_list.js"

59 type="chrome_html" />	71 type="chrome_html" />

60 <structure name="IDR_OPTIONS_FINGERPRINT_LIST_HTML"	72 <structure name="IDR_OPTIONS_FINGERPRINT_LIST_HTML"

61 file="settings/people_page/fingerprint_list.html"	73 file="settings/people_page/fingerprint_list.html"

62 type="chrome_html" />	74 type="chrome_html" />

63 <structure name="IDR_OPTIONS_SETUP_FINGERPRINT_DIALOG_JS"	75 <structure name="IDR_OPTIONS_SETUP_FINGERPRINT_DIALOG_JS"

64 file="settings/people_page/setup_fingerprint_dialog.js"	76 file="settings/people_page/setup_fingerprint_dialog.js"

65 type="chrome_html" />	77 type="chrome_html" />

66 <structure name="IDR_OPTIONS_SETUP_FINGERPRINT_DIALOG_HTML"	78 <structure name="IDR_OPTIONS_SETUP_FINGERPRINT_DIALOG_HTML"

(...skipping 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
142 <structure name="IDR_OPTIONS_I18N_SETUP_HTML"	154 <structure name="IDR_OPTIONS_I18N_SETUP_HTML"

143 file="options/i18n_setup.html"	155 file="options/i18n_setup.html"

144 type="chrome_html" />	156 type="chrome_html" />

145 <structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML"	157 <structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML"

146 file="options/options_polymer.html"	158 file="options/options_polymer.html"

147 type="chrome_html" />	159 type="chrome_html" />

148 </if>	160 </if>

149 </structures>	161 </structures>

150 </release>	162 </release>

151 </grit>	163 </grit>

OLD	NEW