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

Unified Diff: ui/file_manager/file_manager_resources.grd

Issue 2308323002: Refer internal PIEX library by using <include> tag in piex.pexe.txt. (Closed)
Patch Set: Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/file_manager/image_loader/piex/piex.pexe.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/file_manager/file_manager_resources.grd
diff --git a/ui/file_manager/file_manager_resources.grd b/ui/file_manager/file_manager_resources.grd
index 6923c95b61b131ab106daf5536905d87ed1a01e5..9a94fc91b1631c7cde9bbd6d8a9abe2e35e6d5d3 100644
--- a/ui/file_manager/file_manager_resources.grd
+++ b/ui/file_manager/file_manager_resources.grd
@@ -189,15 +189,12 @@
<include name="IDR_IMAGE_LOADER_MANIFEST" file="image_loader/manifest.json" type="BINDATA" />
<include name="IDR_IMAGE_LOADER_BACKGROUND_JS" file="image_loader/background_scripts.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_IMAGE_LOADER_CLIENT_JS" file="image_loader/image_loader_client.js" type="BINDATA" />
+
<!-- Internal resources. -->
- <if expr="not _google_chrome">
- <include name="IDR_IMAGE_LOADER_PIEX_LOADER_PNACL" file="image_loader/piex/piex.pexe.txt" type="BINDATA" />
- </if>
<if expr="_google_chrome">
- <!-- This entry overrides IDR_IMAGE_LOADER_PIEX_LOADER_PNACL with content of ../internal/piex/piex.pexe. -->
- <include name="IDR_IMAGE_LOADER_PIEX_LOADER_PNACL" file="internal/piex/piex.pexe" type="BINDATA" />
+ <include name="IDR_IMAGE_LOADER_PIEX_LOADER_MANIFEST" file="image_loader/piex/piex.nmf.txt" type="BINDATA" />
+ <include name="IDR_IMAGE_LOADER_PIEX_LOADER_PNACL" flattenhtml="true" file="image_loader/piex/piex.pexe.txt" type="BINDATA" />
</if>
- <include name="IDR_IMAGE_LOADER_PIEX_LOADER_MANIFEST" file="image_loader/piex/piex.nmf.txt" type="BINDATA" />
</if>
</includes>
</release>
« no previous file with comments | « no previous file | ui/file_manager/image_loader/piex/piex.pexe.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698