Chromium Code Reviews| Index: chrome/browser/browser_resources.grd |
| diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd |
| index 53f8a2cfd0e9def86ef1bc6e5141e359097c3cbc..db071e80b522ebd0a28099b6e654a10c20b0a0e6 100644 |
| --- a/chrome/browser/browser_resources.grd |
| +++ b/chrome/browser/browser_resources.grd |
| @@ -295,8 +295,14 @@ |
| <include name="IDR_CRYPTOHOME_HTML" file="resources\chromeos\cryptohome.html" flattenhtml="true" type="BINDATA" /> |
| <include name="IDR_CRYPTOHOME_JS" file="resources\chromeos\cryptohome.js" type="BINDATA" /> |
| <!-- manifest file of ChromeVox accessibility extension --> |
| - <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\chromevox\manifest.json" type="BINDATA" /> |
| - <include name="IDR_CHROMEVOX_GUEST_MANIFEST" file="resources\chromeos\chromevox\manifest_guest.json" type="BINDATA" /> |
| + <if expr="'use_chromevox_next' in defs"> |
| + <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\chromevox_next\manifest.json" type="BINDATA" /> |
| + <include name="IDR_CHROMEVOX_GUEST_MANIFEST" file="resources\chromeos\chromevox\manifest_guest.json" type="BINDATA" /> |
|
dmazzoni
2014/05/08 23:29:27
Don't you want to use a chromevox next guest manif
David Tseng
2014/05/08 23:37:47
What caused us to need to use a guest manifest? I'
|
| + </if> |
| + <if expr="not 'use_chromevox_next' in defs"> |
|
dmazzoni
2014/05/08 23:29:27
This essentially makes ChromeVox Next a compile-ti
David Tseng
2014/05/08 23:37:47
I'm mixed on this. I did it this way for the initi
|
| + <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\chromevox\manifest.json" type="BINDATA" /> |
| + <include name="IDR_CHROMEVOX_GUEST_MANIFEST" file="resources\chromeos\chromevox\manifest_guest.json" type="BINDATA" /> |
| + </if> |
| <!-- manifest file of Connectivity Diagnostics app --> |
| <include name="IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST" file="resources\chromeos\connectivity_diagnostics\manifest.json" type="BINDATA" /> |
| <include name="IDR_CONNECTIVITY_DIAGNOSTICS_LAUNCHER_MANIFEST" file="resources\chromeos\connectivity_diagnostics_launcher\manifest.json" type="BINDATA" /> |