Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(249)

Side by Side Diff: ui/webui/resources/webui_resources.grd

Issue 12001003: Move the jstemplate resources back to common_resources.grd to fix test issues. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/jstemplate_builder.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- This comment is only here because changes to resources are not picked up 2 <!-- This comment is only here because changes to resources are not picked up
3 without changes to the corresponding grd file. --> 3 without changes to the corresponding grd file. -->
4 <grit latest_public_release="0" current_release="1"> 4 <grit latest_public_release="0" current_release="1">
5 <outputs> 5 <outputs>
6 <output filename="grit/webui_resources.h" type="rc_header"> 6 <output filename="grit/webui_resources.h" type="rc_header">
7 <emit emit_type='prepend'></emit> 7 <emit emit_type='prepend'></emit>
8 </output> 8 </output>
9 <output filename="grit/webui_resources_map.cc" 9 <output filename="grit/webui_resources_map.cc"
10 type="resource_file_map_source" /> 10 type="resource_file_map_source" />
11 <output filename="grit/webui_resources_map.h" type="resource_map_header" /> 11 <output filename="grit/webui_resources_map.h" type="resource_map_header" />
12 <output filename="webui_resources.pak" type="data_package" /> 12 <output filename="webui_resources.pak" type="data_package" />
13 </outputs> 13 </outputs>
14 <release seq="1"> 14 <release seq="1">
15 <includes> 15 <includes>
16 <include name="IDR_WEBUI_I18N_PROCESS_JS" file="js/i18n_process.js" type=" BINDATA" />
17 <include name="IDR_WEBUI_I18N_TEMPLATE_JS" file="js/i18n_template.js" type ="BINDATA" />
18 <include name="IDR_WEBUI_I18N_TEMPLATE2_JS" file="js/i18n_template2.js" fl attenhtml="true" type="BINDATA" />
19 <include name="IDR_WEBUI_JSTEMPLATE_JS" file="js/jstemplate_compiled.js" f lattenhtml="true" type="BINDATA" />
20 <include name="IDR_WEBUI_IMAGES_CHECK" 16 <include name="IDR_WEBUI_IMAGES_CHECK"
21 file="images/check.png" type="BINDATA" /> 17 file="images/check.png" type="BINDATA" />
22 <include name="IDR_WEBUI_IMAGES_CHECKBOX_BLACK" 18 <include name="IDR_WEBUI_IMAGES_CHECKBOX_BLACK"
23 file="images/checkbox_black.png" type="BINDATA" /> 19 file="images/checkbox_black.png" type="BINDATA" />
24 <include name="IDR_WEBUI_IMAGES_CHECKBOX_WHITE" 20 <include name="IDR_WEBUI_IMAGES_CHECKBOX_WHITE"
25 file="images/checkbox_white.png" type="BINDATA" /> 21 file="images/checkbox_white.png" type="BINDATA" />
26 <include name="IDR_WEBUI_IMAGES_DISABLED_SELECT" 22 <include name="IDR_WEBUI_IMAGES_DISABLED_SELECT"
27 file="images/disabled_select.png" type="BINDATA" /> 23 file="images/disabled_select.png" type="BINDATA" />
28 <include name="IDR_WEBUI_IMAGES_GEAR" 24 <include name="IDR_WEBUI_IMAGES_GEAR"
29 file="images/gear.png" type="BINDATA" /> 25 file="images/gear.png" type="BINDATA" />
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 <structure name="IDR_WEBUI_CSS_UI_ACCOUNT_TWEAKS" 202 <structure name="IDR_WEBUI_CSS_UI_ACCOUNT_TWEAKS"
207 file="css/chromeos/ui_account_tweaks.css" 203 file="css/chromeos/ui_account_tweaks.css"
208 type="chrome_html" /> 204 type="chrome_html" />
209 <structure name="IDR_WEBUI_JS_UI_ACCOUNT_TWEAKS" 205 <structure name="IDR_WEBUI_JS_UI_ACCOUNT_TWEAKS"
210 file="js/chromeos/ui_account_tweaks.js" 206 file="js/chromeos/ui_account_tweaks.js"
211 type="chrome_html" /> 207 type="chrome_html" />
212 </if> 208 </if>
213 </structures> 209 </structures>
214 </release> 210 </release>
215 </grit> 211 </grit>
OLDNEW
« no previous file with comments | « chrome/common/jstemplate_builder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698