chrome/browser/resources/component_extension_resources.grd - Issue 438513002: Add the whispernet proxy.

Side by Side Diff: chrome/browser/resources/component_extension_resources.grd

Issue 438513002: Add the whispernet proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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

« chrome/browser/extensions/api/copresence_private/copresence_private_api.cc ('K') | « chrome/browser/extensions/api/copresence_private/copresence_private_api.cc ('k') | chrome/browser/resources/whispernet_proxy/OWNERS » ('j') | chrome/browser/resources/whispernet_proxy/background.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/component_extension_resources.h" type="rc_header">	6 <output filename="grit/component_extension_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/component_extension_resources_map.cc" type="resource_ file_map_source" />	9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" />

10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" />	10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" />

(...skipping 154 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
165 <include name="IDR_CRYPTOTOKEN_APPID_JS" file="cryptotoken/appid.js" type= "BINDATA" />	165 <include name="IDR_CRYPTOTOKEN_APPID_JS" file="cryptotoken/appid.js" type= "BINDATA" />

166 <include name="IDR_CRYPTOTOKEN_BACKGROUND_JS" file="cryptotoken/background .js" type="BINDATA" />	166 <include name="IDR_CRYPTOTOKEN_BACKGROUND_JS" file="cryptotoken/background .js" type="BINDATA" />

167 <if expr="chromeos and _google_chrome">	167 <if expr="chromeos and _google_chrome">

168 <include name="IDR_LEDGER_BACKGROUND_HTML" file="../extensions/api/ledge r/ledger_proxy/background.html" flattenhtml="true" allowexternalscript="true" ty pe="BINDATA" />	168 <include name="IDR_LEDGER_BACKGROUND_HTML" file="../extensions/api/ledge r/ledger_proxy/background.html" flattenhtml="true" allowexternalscript="true" ty pe="BINDATA" />

169 <include name="IDR_LEDGER_INIT_JS" file="../extensions/api/ledger/ledger _proxy/js/init.js" type="BINDATA" />	169 <include name="IDR_LEDGER_INIT_JS" file="../extensions/api/ledger/ledger _proxy/js/init.js" type="BINDATA" />

170 <include name="IDR_LEDGER_NACL_JS" file="../extensions/api/ledger/ledger _proxy/js/nacl.js" type="BINDATA" />	170 <include name="IDR_LEDGER_NACL_JS" file="../extensions/api/ledger/ledger _proxy/js/nacl.js" type="BINDATA" />

171 <include name="IDR_LEDGER_WRAPPER_JS" file="../extensions/api/ledger/led ger_proxy/js/wrapper.js" type="BINDATA" />	171 <include name="IDR_LEDGER_WRAPPER_JS" file="../extensions/api/ledger/led ger_proxy/js/wrapper.js" type="BINDATA" />

172 <include name="IDR_LEDGER_LEDGER_PROXY_NMF" file="../extensions/api/ledg er/ledger_proxy/ledger_proxy.nmf.js" type="BINDATA" />	172 <include name="IDR_LEDGER_LEDGER_PROXY_NMF" file="../extensions/api/ledg er/ledger_proxy/ledger_proxy.nmf.js" type="BINDATA" />

173 <include name="IDR_LEDGER_LEDGER_PROXY_PEXE" file="../extensions/api/led ger/ledger_proxy/ledger_proxy_pnacl.pexe.js" type="BINDATA" />	173 <include name="IDR_LEDGER_LEDGER_PROXY_PEXE" file="../extensions/api/led ger/ledger_proxy/ledger_proxy_pnacl.pexe.js" type="BINDATA" />

174 </if>	174 </if>

	175 <include name="IDR_WHISPERNET_PROXY_BACKGROUND_HTML" file="whispernet_prox y/background.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />

	176 <include name="IDR_WHISPERNET_PROXY_INIT_JS" file="whispernet_proxy/js/ini t.js" type="BINDATA" />

	177 <include name="IDR_WHISPERNET_PROXY_NACL_JS" file="whispernet_proxy/js/nac l.js" type="BINDATA" />

	178 <include name="IDR_WHISPERNET_PROXY_WRAPPER_JS" file="whispernet_proxy/js/ wrapper.js" type="BINDATA" />

	179 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.html" type="BINDATA" />

	180 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.js" type="BINDATA" />
	xiyuan 2014/07/31 19:22:22 Where is this "whispernet_proxy_pnacl.pexe.js" fil Where is this "whispernet_proxy_pnacl.pexe.js" file? rkc 2014/07/31 23:12:53 I am having trouble with the presubmit on that fil Show quoted text On 2014/07/31 19:22:22, xiyuan wrote: > Where is this "whispernet_proxy_pnacl.pexe.js" file? I am having trouble with the presubmit on that file, I'll figure out how to add it to the exclude list and upload it. The test will fail without it so this CL can't land without it there anyway :)
175 </includes>	181 </includes>

176 </release>	182 </release>

177 </grit>	183 </grit>

OLD	NEW