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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: content/content_resources.grd

Issue 835253002: Update mojo sdk to rev e3719475d5971283d1d2250533d53066b2ff9797 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « content/browser/webui/web_ui_mojo_browsertest.cc ('k') | extensions/renderer/dispatcher.cc » ('j') | 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 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 20 matching lines...) Expand all
31 <include name="IDR_WEBRTC_INTERNALS_HTML" file="browser/resources/media/we brtc_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 31 <include name="IDR_WEBRTC_INTERNALS_HTML" file="browser/resources/media/we brtc_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
32 <include name="IDR_WEBRTC_INTERNALS_JS" file="browser/resources/media/webr tc_internals.js" flattenhtml="true" type="BINDATA" /> 32 <include name="IDR_WEBRTC_INTERNALS_JS" file="browser/resources/media/webr tc_internals.js" flattenhtml="true" type="BINDATA" />
33 <if expr="is_macosx"> 33 <if expr="is_macosx">
34 <include name="IDR_GPU_SANDBOX_PROFILE" file="browser/gpu.sb" type="BIND ATA" /> 34 <include name="IDR_GPU_SANDBOX_PROFILE" file="browser/gpu.sb" type="BIND ATA" />
35 <include name="IDR_COMMON_SANDBOX_PROFILE" file="common/common.sb" type= "BINDATA" /> 35 <include name="IDR_COMMON_SANDBOX_PROFILE" file="common/common.sb" type= "BINDATA" />
36 <include name="IDR_PPAPI_SANDBOX_PROFILE" file="ppapi_plugin/ppapi.sb" t ype="BINDATA" /> 36 <include name="IDR_PPAPI_SANDBOX_PROFILE" file="ppapi_plugin/ppapi.sb" t ype="BINDATA" />
37 <include name="IDR_RENDERER_SANDBOX_PROFILE" file="renderer/renderer.sb" type="BINDATA" /> 37 <include name="IDR_RENDERER_SANDBOX_PROFILE" file="renderer/renderer.sb" type="BINDATA" />
38 <include name="IDR_UTILITY_SANDBOX_PROFILE" file="utility/utility.sb" ty pe="BINDATA" /> 38 <include name="IDR_UTILITY_SANDBOX_PROFILE" file="utility/utility.sb" ty pe="BINDATA" />
39 </if> 39 </if>
40 <if expr="not is_ios"> 40 <if expr="not is_ios">
41 <include name="IDR_MOJO_BINDINGS_JS" file="../mojo/public/js/bindings.js " flattenhtml="true" type="BINDATA" />
41 <include name="IDR_MOJO_BUFFER_JS" file="../mojo/public/js/buffer.js" fl attenhtml="true" type="BINDATA" /> 42 <include name="IDR_MOJO_BUFFER_JS" file="../mojo/public/js/buffer.js" fl attenhtml="true" type="BINDATA" />
42 <include name="IDR_MOJO_CODEC_JS" file="../mojo/public/js/codec.js" flat tenhtml="true" type="BINDATA" /> 43 <include name="IDR_MOJO_CODEC_JS" file="../mojo/public/js/codec.js" flat tenhtml="true" type="BINDATA" />
43 <include name="IDR_MOJO_CONNECTION_JS" file="../mojo/public/js/connectio n.js" flattenhtml="true" type="BINDATA" /> 44 <include name="IDR_MOJO_CONNECTION_JS" file="../mojo/public/js/connectio n.js" flattenhtml="true" type="BINDATA" />
44 <include name="IDR_MOJO_CONNECTOR_JS" file="../mojo/public/js/connector. js" flattenhtml="true" type="BINDATA" /> 45 <include name="IDR_MOJO_CONNECTOR_JS" file="../mojo/public/js/connector. js" flattenhtml="true" type="BINDATA" />
45 <include name="IDR_MOJO_ROUTER_JS" file="../mojo/public/js/router.js" fl attenhtml="true" type="BINDATA" /> 46 <include name="IDR_MOJO_ROUTER_JS" file="../mojo/public/js/router.js" fl attenhtml="true" type="BINDATA" />
46 <include name="IDR_MOJO_UNICODE_JS" file="../mojo/public/js/unicode.js" flattenhtml="true" type="BINDATA" /> 47 <include name="IDR_MOJO_UNICODE_JS" file="../mojo/public/js/unicode.js" flattenhtml="true" type="BINDATA" />
47 <include name="IDR_MOJO_VALIDATOR_JS" file="../mojo/public/js/validator. js" flattenhtml="true" type="BINDATA" /> 48 <include name="IDR_MOJO_VALIDATOR_JS" file="../mojo/public/js/validator. js" flattenhtml="true" type="BINDATA" />
48 </if> 49 </if>
49 </includes> 50 </includes>
50 </release> 51 </release>
51 </grit> 52 </grit>
OLDNEW
« no previous file with comments | « content/browser/webui/web_ui_mojo_browsertest.cc ('k') | extensions/renderer/dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698