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

Side by Side Diff: ui/file_manager/file_manager_resources.grd

Issue 1034713002: Files.app: Enable PIEX loader for official build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | « no previous file | no next file » | 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 <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/file_manager_resources.h" type="rc_header"> 4 <output filename="grit/file_manager_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/file_manager_resources_map.cc" type="resource_file_ma p_source" /> 7 <output filename="grit/file_manager_resources_map.cc" type="resource_file_ma p_source" />
8 <output filename="grit/file_manager_resources_map.h" type="resource_map_head er" /> 8 <output filename="grit/file_manager_resources_map.h" type="resource_map_head er" />
9 <output filename="file_manager_resources.pak" type="data_package" /> 9 <output filename="file_manager_resources.pak" type="data_package" />
10 <output filename="file_manager_resources.rc" type="rc_all" /> 10 <output filename="file_manager_resources.rc" type="rc_all" />
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 <if expr="image_loader_extension"> 144 <if expr="image_loader_extension">
145 <include name="IDR_IMAGE_LOADER_MANIFEST" file="image_loader/manifest.js on" type="BINDATA" /> 145 <include name="IDR_IMAGE_LOADER_MANIFEST" file="image_loader/manifest.js on" type="BINDATA" />
146 <include name="IDR_IMAGE_LOADER_IMAGE_LOADER_JS" file="image_loader/imag e_loader.js" type="BINDATA" /> 146 <include name="IDR_IMAGE_LOADER_IMAGE_LOADER_JS" file="image_loader/imag e_loader.js" type="BINDATA" />
147 <include name="IDR_IMAGE_LOADER_CACHE_JS" file="image_loader/cache.js" t ype="BINDATA" /> 147 <include name="IDR_IMAGE_LOADER_CACHE_JS" file="image_loader/cache.js" t ype="BINDATA" />
148 <include name="IDR_IMAGE_LOADER_SCHEDULER_JS" file="image_loader/schedul er.js" type="BINDATA" /> 148 <include name="IDR_IMAGE_LOADER_SCHEDULER_JS" file="image_loader/schedul er.js" type="BINDATA" />
149 <include name="IDR_IMAGE_LOADER_REQUEST_JS" file="image_loader/request.j s" type="BINDATA" /> 149 <include name="IDR_IMAGE_LOADER_REQUEST_JS" file="image_loader/request.j s" type="BINDATA" />
150 <include name="IDR_IMAGE_LOADER_BACKGROUND_JS" file="image_loader/backgr ound.js" type="BINDATA" /> 150 <include name="IDR_IMAGE_LOADER_BACKGROUND_JS" file="image_loader/backgr ound.js" type="BINDATA" />
151 <include name="IDR_IMAGE_LOADER_CLIENT_JS" file="image_loader/image_load er_client.js" type="BINDATA" /> 151 <include name="IDR_IMAGE_LOADER_CLIENT_JS" file="image_loader/image_load er_client.js" type="BINDATA" />
152 <include name="IDR_IMAGE_LOADER_PIEX_LOADER_JS" file="image_loader/piex_ loader.js" flattenhtml="true" type="BINDATA" /> 152 <include name="IDR_IMAGE_LOADER_PIEX_LOADER_JS" file="image_loader/piex_ loader.js" flattenhtml="true" type="BINDATA" />
153 <!-- Internal resources. --> 153 <!-- Internal resources. -->
154 <include name="IDR_IMAGE_LOADER_PIEX_LOADER_PNACL" file="image_loader/pi ex/piex.pexe.txt" type="BINDATA" /> 154 <if expr="not _google_chrome">
155 <include name="IDR_IMAGE_LOADER_PIEX_LOADER_PNACL" file="image_loader/ piex/piex.pexe.txt" type="BINDATA" />
156 </if>
157 <if expr="_google_chrome">
158 <!-- This entry overrides IDR_IMAGE_LOADER_PIEX_LOADER_PNACL with cont ent of ../internal/piex/piex.pexe. -->
159 <include name="IDR_IMAGE_LOADER_PIEX_LOADER_PNACL" file="internal/piex /piex.pexe" type="BINDATA" />
160 </if>
155 <include name="IDR_IMAGE_LOADER_PIEX_LOADER_MANIFEST" file="image_loader /piex/piex.nmf.txt" type="BINDATA" /> 161 <include name="IDR_IMAGE_LOADER_PIEX_LOADER_MANIFEST" file="image_loader /piex/piex.nmf.txt" type="BINDATA" />
156 </if> 162 </if>
157 </includes> 163 </includes>
158 </release> 164 </release>
159 </grit> 165 </grit>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698