chrome/common/common_resources.grd - Issue 12001003: Move the jstemplate resources back to common_resources.grd to fix test issues.

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/common/common_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

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">	2 <grit latest_public_release="0" current_release="1">

3 <outputs>	3 <outputs>

4 <output filename="grit/common_resources.h" type="rc_header">	4 <output filename="grit/common_resources.h" type="rc_header">

5 <emit emit_type='prepend'></emit>	5 <emit emit_type='prepend'></emit>

6 </output>	6 </output>

7 <output filename="common_resources.pak" type="data_package" />	7 <output filename="common_resources.pak" type="data_package" />

8 <output filename="common_resources.rc" type="rc_all" />	8 <output filename="common_resources.rc" type="rc_all" />

9 </outputs>	9 </outputs>

10 <release seq="1">	10 <release seq="1">

11 <includes>	11 <includes>

12 <include name="IDR_EXTENSION_MANIFEST_FEATURES" file="extensions\api\_mani fest_features.json" type="BINDATA" />	12 <include name="IDR_EXTENSION_MANIFEST_FEATURES" file="extensions\api\_mani fest_features.json" type="BINDATA" />

13 <include name="IDR_EXTENSION_PERMISSION_FEATURES" file="extensions\api\_pe rmission_features.json" type="BINDATA" />	13 <include name="IDR_EXTENSION_PERMISSION_FEATURES" file="extensions\api\_pe rmission_features.json" type="BINDATA" />

	14 <include name="IDR_I18N_PROCESS_JS" file="..\..\ui\webui\resources\js\i18n _process.js" type="BINDATA" />

	15 <include name="IDR_I18N_TEMPLATE_JS" file="..\..\ui\webui\resources\js\i18 n_template.js" type="BINDATA" />

	16 <include name="IDR_I18N_TEMPLATE2_JS" file="..\..\ui\webui\resources\js\i1 8n_template2.js" flattenhtml="true" type="BINDATA" />

	17 <include name="IDR_JSTEMPLATE_JS" file="..\..\ui\webui\resources\js\jstemp late_compiled.js" flattenhtml="true" type="BINDATA" />

14 <include name="IDR_WEB_APP_SCHEMA" file="web_app_schema.json" type="BINDAT A" />	18 <include name="IDR_WEB_APP_SCHEMA" file="web_app_schema.json" type="BINDAT A" />

15 <if expr="is_macosx">	19 <if expr="is_macosx">

16 <include name="IDR_NACL_SANDBOX_PROFILE" file="nacl_loader.sb" type="BIN DATA" />	20 <include name="IDR_NACL_SANDBOX_PROFILE" file="nacl_loader.sb" type="BIN DATA" />

17 </if>	21 </if>

18 </includes>	22 </includes>

19 </release>	23 </release>

20 </grit>	24 </grit>

OLD	NEW

« no previous file with comments | « chrome/browser/ui/webui/chrome_web_ui_data_source_unittest.cc ('k') | chrome/common/jstemplate_builder.cc » ('j') | no next file with comments »