chrome/browser/resources/options_resources.grd - Issue 2626283005: Fix polymer import issue in options after changes in lock_screen.html

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

Issue 2626283005: Fix polymer import issue in options after changes in lock_screen.html (Closed)

Patch Set: rebase 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/ui/webui/options/options_ui.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/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 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 allowexternalscript="true" />	79 allowexternalscript="true" />

80 <structure name="IDR_OPTIONS_ROUTE_JS"	80 <structure name="IDR_OPTIONS_ROUTE_JS"

81 file="settings/route.js"	81 file="settings/route.js"

82 type="chrome_html"	82 type="chrome_html"

83 flattenhtml="true" />	83 flattenhtml="true" />

84 <structure name="IDR_SETTINGS_SHARED_CSS_HTML"	84 <structure name="IDR_SETTINGS_SHARED_CSS_HTML"

85 file="settings/settings_shared_css.html"	85 file="settings/settings_shared_css.html"

86 type="chrome_html"	86 type="chrome_html"

87 flattenhtml="true"	87 flattenhtml="true"

88 allowexternalscript="true" />	88 allowexternalscript="true" />

	89 <structure name="IDR_SETTINGS_TOGGLE_BUTTON_HTML"

	90 file="settings/controls/settings_toggle_button.html"

	91 type="chrome_html"

	92 flattenhtml="true"

	93 allowexternalscript="true" />

	94 <structure name="IDR_SETTINGS_TOGGLE_BUTTON_JS"

	95 file="settings/controls/settings_toggle_button.js"

	96 type="chrome_html"

	97 flattenhtml="true" />

	98 <structure name="IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_HTML"

	99 file="settings/controls/settings_boolean_control_behavior.htm l"

	100 type="chrome_html"

	101 flattenhtml="true"

	102 allowexternalscript="true" />

	103 <structure name="IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_JS"

	104 file="settings/controls/settings_boolean_control_behavior.js"

	105 type="chrome_html"

	106 flattenhtml="true" />

	107 <structure name="IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_HTML"

	108 file="settings/controls/pref_control_behavior.html"

	109 type="chrome_html"

	110 flattenhtml="true"

	111 allowexternalscript="true" />

	112 <structure name="IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_JS"

	113 file="settings/controls/pref_control_behavior.js"

	114 type="chrome_html"

	115 flattenhtml="true" />

89 <structure name="IDR_SETTINGS_VARS_CSS_HTML"	116 <structure name="IDR_SETTINGS_VARS_CSS_HTML"

90 file="settings/settings_vars_css.html"	117 file="settings/settings_vars_css.html"

91 type="chrome_html"	118 type="chrome_html"

92 flattenhtml="true"	119 flattenhtml="true"

93 allowexternalscript="true" />	120 allowexternalscript="true" />

94 <structure name="IDR_SETTINGS_PREFS_BEHAVIOR_HTML"	121 <structure name="IDR_SETTINGS_PREFS_BEHAVIOR_HTML"

95 file="settings/prefs/prefs_behavior.html"	122 file="settings/prefs/prefs_behavior.html"

96 type="chrome_html"	123 type="chrome_html"

97 flattenhtml="true"	124 flattenhtml="true"

98 allowexternalscript="true" />	125 allowexternalscript="true" />

(...skipping 12 matching lines...) Expand all Loading...
111 flattenhtml="true" />	138 flattenhtml="true" />

112 <structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML"	139 <structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML"

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

114 type="chrome_html"	141 type="chrome_html"

115 flattenhtml="true"	142 flattenhtml="true"

116 allowexternalscript="true" />	143 allowexternalscript="true" />

117 </if>	144 </if>

118 </structures>	145 </structures>

119 </release>	146 </release>

120 </grit>	147 </grit>

OLD	NEW