| Index: chrome/browser/browser_resources.grd
|
| diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
|
| index 62190b9de558b81c9dd7f3040b16fb333b58873a..3c37966e13b5e62b95106a233f08053cf6adba86 100644
|
| --- a/chrome/browser/browser_resources.grd
|
| +++ b/chrome/browser/browser_resources.grd
|
| @@ -13,15 +13,8 @@
|
| <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\start_page.html" flattenhtml="true" type="chrome_html" />
|
| <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\start_page.js" flattenhtml="true" type="chrome_html" />
|
| </if>
|
| - <if expr="not is_android">
|
| - <if expr="use_vulcanize">
|
| - <then>
|
| - <structure name="IDR_MD_DOWNLOADS_VULCANIZED_HTML" file="resources\md_downloads\vulcanized.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
|
| - </then>
|
| - <else>
|
| - <structure name="IDR_MD_DOWNLOADS_DOWNLOADS_HTML" file="resources\md_downloads\downloads.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
|
| - </else>
|
| - </if>
|
| + <if expr="not is_android and not use_vulcanize">
|
| + <structure name="IDR_MD_DOWNLOADS_DOWNLOADS_HTML" file="resources\md_downloads\downloads.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
|
| </if>
|
| <if expr="enable_extensions">
|
| <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensions.html" flattenhtml="true" type="chrome_html" />
|
| @@ -144,7 +137,8 @@
|
| <include name="IDR_MD_DOWNLOADS_2X_NO_DOWNLOADS_PNG" file="resources\md_downloads\2x\no_downloads.png" type="BINDATA" />
|
| <if expr="use_vulcanize">
|
| <then>
|
| - <include name="IDR_MD_DOWNLOADS_CRISPER_JS" file="resources\md_downloads\crisper.js" flattenhtml="true" type="BINDATA" />
|
| + <include name="IDR_MD_DOWNLOADS_CRISPER_JS" file="resources\md_downloads\crisper.js" flattenhtml="true" type="BINDATA" compress="gzip" />
|
| + <include name="IDR_MD_DOWNLOADS_VULCANIZED_HTML" file="resources\md_downloads\vulcanized.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
|
| </then>
|
| <else>
|
| <include name="IDR_MD_DOWNLOADS_ACTION_SERVICE_HTML" file="resources\md_downloads\action_service.html" type="BINDATA" />
|
|
|