content/content_resources.grd - Issue 8589001: Load mac sandbox definitions from resources instead of the bundle.

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: content/content_resources.grd

Issue 8589001: Load mac sandbox definitions from resources instead of the bundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: also remove old bundle gyp code Created 9 years, 1 month 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	2

3 <!--	3 <!--

4 This file contains resources required by each embedder of content.	4 This file contains resources required by each embedder of content.

5	5

6 Currently, the resources are only included on Linux and Mac. If you add	6 Currently, the resources are only included on Linux and Mac. If you add

7 resources that need to be available on windows as well, you'll need to add	7 resources that need to be available on windows as well, you'll need to add

8 content_resources.rc file to the respective targets.	8 content_resources.rc file to the respective targets.

9 -->	9 -->

10	10

11 <grit latest_public_release="0" current_release="1">	11 <grit latest_public_release="0" current_release="1">

12 <outputs>	12 <outputs>

13 <output filename="grit/content_resources.h" type="rc_header">	13 <output filename="grit/content_resources.h" type="rc_header">

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

15 </output>	15 </output>

16 <output filename="content_resources.pak" type="data_package" />	16 <output filename="content_resources.pak" type="data_package" />

17 <output filename="content_resources.rc" type="rc_all" />	17 <output filename="content_resources.rc" type="rc_all" />

18 </outputs>	18 </outputs>

19 <translations />	19 <translations />

20 <release seq="1">	20 <release seq="1">

21 <includes>	21 <includes>

22 <if expr="is_macosx">	22 <if expr="is_macosx">

	23 <!-- If you add a sandbox definition here, please also update

	24 common/sandbox_mac_unittest_helper.mm -->

23 <include name="IDR_GPU_SANDBOX_DEFINITION" file="browser/gpu.sb" type="B INDATA" />	25 <include name="IDR_GPU_SANDBOX_DEFINITION" file="browser/gpu.sb" type="B INDATA" />

24 <include name="IDR_WORKER_SANDBOX_DEFINITION" file="browser/worker.sb" t ype="BINDATA" />	26 <include name="IDR_WORKER_SANDBOX_DEFINITION" file="browser/worker.sb" t ype="BINDATA" />

25 <include name="IDR_COMMON_SANDBOX_DEFINITION" file="common/common.sb" ty pe="BINDATA" />	27 <include name="IDR_COMMON_SANDBOX_DEFINITION" file="common/common.sb" ty pe="BINDATA" />

26 <include name="IDR_PPAPI_SANDBOX_DEFINITION" file="ppapi_plugin/ppapi.sb " type="BINDATA" />	28 <include name="IDR_PPAPI_SANDBOX_DEFINITION" file="ppapi_plugin/ppapi.sb " type="BINDATA" />

27 <include name="IDR_RENDERER_SANDBOX_DEFINITION" file="renderer/renderer. sb" type="BINDATA" />	29 <include name="IDR_RENDERER_SANDBOX_DEFINITION" file="renderer/renderer. sb" type="BINDATA" />

28 <include name="IDR_UTILITY_SANDBOX_DEFINITION" file="utility/utility.sb" type="BINDATA" />	30 <include name="IDR_UTILITY_SANDBOX_DEFINITION" file="utility/utility.sb" type="BINDATA" />

29 </if>	31 </if>

30 </includes>	32 </includes>

31 </release>	33 </release>

32 </grit>	34 </grit>

OLD	NEW

« content/common/sandbox_mac_unittest_helper.h ('K') | « content/content_renderer.gypi ('k') | content/content_resources.gyp » ('j') | no next file with comments »