Index: chrome/browser/browser_resources.grd |
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd |
index 7e41a037d2d23f6a694eee5ad40598f175804c68..79d1e275ef3224d6f334285f13a4f10730ce4c7b 100644 |
--- a/chrome/browser/browser_resources.grd |
+++ b/chrome/browser/browser_resources.grd |
@@ -9,18 +9,18 @@ |
</outputs> |
<release seq="1"> |
<includes> |
- <if expr="os.find('win') != -1"> |
+ <if expr="is_win"> |
<include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts.html" flattenhtml="true" type="BINDATA" /> |
</if> |
<include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> |
<include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="BINDATA" /> |
- <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> |
+ <if expr="is_posix and not is_macosx"> |
<include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux.html" flattenhtml="true" type="BINDATA" /> |
</if> |
- <if expr="os == 'darwin'"> |
+ <if expr="is_macosx"> |
<include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.html" flattenhtml="true" type="BINDATA" /> |
</if> |
- <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1 and os != 'sunos5'"> |
+ <if expr="is_win"> |
<include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="BINDATA" /> |
</if> |
<include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" flattenhtml="true" type="BINDATA" /> |
@@ -30,10 +30,10 @@ |
<include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flattenhtml="true" type="BINDATA" /> |
<include name="IDR_DOWNLOADS_JS" file="resources\downloads.js" type="BINDATA" /> |
<include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> |
- <if expr="os == 'darwin'"> |
+ <if expr="is_macosx"> |
<include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_infobar_mac.css" flattenhtml="true" type="BINDATA" /> |
</if> |
- <if expr="os != 'darwin'"> |
+ <if expr="not is_macosx"> |
<include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_infobar.css" flattenhtml="true" type="BINDATA" /> |
</if> |
<include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" /> |