content/content_resources.grd - Issue 226213002: Removes use_mojo

Side by Side Diff: content/content_resources.grd

Issue 226213002: Removes use_mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge 2 trunk Created 6 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « content/content_renderer.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2	2

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

4 <outputs>	4 <outputs>

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

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

7 </output>	7 </output>

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

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

10 </outputs>	10 </outputs>

(...skipping 16 matching lines...) Expand all Loading...
27 <include name="IDR_WEBRTC_INTERNALS_HTML" file="browser/resources/media/we brtc_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />	27 <include name="IDR_WEBRTC_INTERNALS_HTML" file="browser/resources/media/we brtc_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />

28 <include name="IDR_WEBRTC_INTERNALS_JS" file="browser/resources/media/webr tc_internals.js" flattenhtml="true" type="BINDATA" />	28 <include name="IDR_WEBRTC_INTERNALS_JS" file="browser/resources/media/webr tc_internals.js" flattenhtml="true" type="BINDATA" />

29 <if expr="is_macosx">	29 <if expr="is_macosx">

30 <include name="IDR_GPU_SANDBOX_PROFILE" file="browser/gpu.sb" type="BIND ATA" />	30 <include name="IDR_GPU_SANDBOX_PROFILE" file="browser/gpu.sb" type="BIND ATA" />

31 <include name="IDR_WORKER_SANDBOX_PROFILE" file="browser/worker.sb" type ="BINDATA" />	31 <include name="IDR_WORKER_SANDBOX_PROFILE" file="browser/worker.sb" type ="BINDATA" />

32 <include name="IDR_COMMON_SANDBOX_PROFILE" file="common/common.sb" type= "BINDATA" />	32 <include name="IDR_COMMON_SANDBOX_PROFILE" file="common/common.sb" type= "BINDATA" />

33 <include name="IDR_PPAPI_SANDBOX_PROFILE" file="ppapi_plugin/ppapi.sb" t ype="BINDATA" />	33 <include name="IDR_PPAPI_SANDBOX_PROFILE" file="ppapi_plugin/ppapi.sb" t ype="BINDATA" />

34 <include name="IDR_RENDERER_SANDBOX_PROFILE" file="renderer/renderer.sb" type="BINDATA" />	34 <include name="IDR_RENDERER_SANDBOX_PROFILE" file="renderer/renderer.sb" type="BINDATA" />

35 <include name="IDR_UTILITY_SANDBOX_PROFILE" file="utility/utility.sb" ty pe="BINDATA" />	35 <include name="IDR_UTILITY_SANDBOX_PROFILE" file="utility/utility.sb" ty pe="BINDATA" />

36 </if>	36 </if>

37 <if expr="use_mojo">	37 <if expr="not is_ios">

38 <include name="IDR_MOJO_CODEC_JS" file="../mojo/public/js/bindings/codec .js" flattenhtml="true" type="BINDATA" />	38 <include name="IDR_MOJO_CODEC_JS" file="../mojo/public/js/bindings/codec .js" flattenhtml="true" type="BINDATA" />

39 <include name="IDR_MOJO_CONNECTION_JS" file="../mojo/public/js/bindings/ connection.js" flattenhtml="true" type="BINDATA" />	39 <include name="IDR_MOJO_CONNECTION_JS" file="../mojo/public/js/bindings/ connection.js" flattenhtml="true" type="BINDATA" />

40 <include name="IDR_MOJO_CONNECTOR_JS" file="../mojo/public/js/bindings/c onnector.js" flattenhtml="true" type="BINDATA" />	40 <include name="IDR_MOJO_CONNECTOR_JS" file="../mojo/public/js/bindings/c onnector.js" flattenhtml="true" type="BINDATA" />

41 <include name="IDR_MOJO_ROUTER_JS" file="../mojo/public/js/bindings/rout er.js" flattenhtml="true" type="BINDATA" />	41 <include name="IDR_MOJO_ROUTER_JS" file="../mojo/public/js/bindings/rout er.js" flattenhtml="true" type="BINDATA" />

42 </if>	42 </if>

43 </includes>	43 </includes>

44 </release>	44 </release>

45 </grit>	45 </grit>

OLD	NEW