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 15c9ea0cf1d920975839f324324c3d1529c08bab..8279a746257ebe5681708fdc37dbd6dfaea607d5 100644 |
--- a/ui/file_manager/file_manager_resources.grd |
+++ b/ui/file_manager/file_manager_resources.grd |
@@ -151,7 +151,13 @@ |
<include name="IDR_IMAGE_LOADER_CLIENT_JS" file="image_loader/image_loader_client.js" type="BINDATA" /> |
<include name="IDR_IMAGE_LOADER_PIEX_LOADER_JS" file="image_loader/piex_loader.js" flattenhtml="true" type="BINDATA" /> |
<!-- Internal resources. --> |
- <include name="IDR_IMAGE_LOADER_PIEX_LOADER_PNACL" file="image_loader/piex/piex.pexe.txt" type="BINDATA" /> |
+ <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" /> |
+ </if> |
<include name="IDR_IMAGE_LOADER_PIEX_LOADER_MANIFEST" file="image_loader/piex/piex.nmf.txt" type="BINDATA" /> |
</if> |
</includes> |