diff options
| author | hirono <hirono@chromium.org> | 2015-03-26 06:06:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-26 13:07:10 +0000 |
| commit | e4193786c7e9a5e7c8819eb9523a5be6a19e6a21 (patch) | |
| tree | 024456cacacc414c2d02ff1eed66fba41ac4408f /ui | |
| parent | 50a7d1a916772bc3e7b55f17cb7dc23663dda54a (diff) | |
| download | chromium_src-e4193786c7e9a5e7c8819eb9523a5be6a19e6a21.zip chromium_src-e4193786c7e9a5e7c8819eb9523a5be6a19e6a21.tar.gz chromium_src-e4193786c7e9a5e7c8819eb9523a5be6a19e6a21.tar.bz2 | |
Files.app: Enable PIEX loader for official build.
The PIEX library has been submitted to official chrome repository.
The CL let Files.app use the library to load RAW thumbnails.
BUG=396702
TEST=None
Review URL: https://codereview.chromium.org/1034713002
Cr-Commit-Position: refs/heads/master@{#322372}
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/file_manager/file_manager_resources.grd | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ui/file_manager/file_manager_resources.grd b/ui/file_manager/file_manager_resources.grd index 15c9ea0..8279a74 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> |