summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-15 23:44:04 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-15 23:44:04 +0000
commit115d27dcb8ddd0b6985ba0bea0f2fb4e0dcde70c (patch)
treeb5acc0dbabf1b47c0d408204c680a57170ec370c /app
parent2e12a23d5fee3aa7df22f2de726ee048fd7b3867 (diff)
downloadchromium_src-115d27dcb8ddd0b6985ba0bea0f2fb4e0dcde70c.zip
chromium_src-115d27dcb8ddd0b6985ba0bea0f2fb4e0dcde70c.tar.gz
chromium_src-115d27dcb8ddd0b6985ba0bea0f2fb4e0dcde70c.tar.bz2
Remove references to 'linux2' from our grd files.
BUG=85845 Review URL: http://codereview.chromium.org/7181002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/resources/app_resources.grd8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/resources/app_resources.grd b/app/resources/app_resources.grd
index 6bd2388..c95e325 100644
--- a/app/resources/app_resources.grd
+++ b/app/resources/app_resources.grd
@@ -18,7 +18,7 @@
<include name="IDR_CLOSE_H" file="close_h.png" type="BINDATA" />
<include name="IDR_CLOSE_P" file="close_p.png" type="BINDATA" />
</if>
- <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5')">
+ <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
<include name="IDR_CLOSE" file="linux_close.png" type="BINDATA" />
<include name="IDR_CLOSE_H" file="linux_close_h.png" type="BINDATA" />
<include name="IDR_CLOSE_P" file="linux_close_p.png" type="BINDATA" />
@@ -42,7 +42,7 @@
<include name="IDR_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" />
<include name="IDR_MAXIMIZE_P" file="maximize_p.png" type="BINDATA" />
</if>
- <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5')">
+ <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
<include name="IDR_MAXIMIZE" file="linux_maximize.png" type="BINDATA" />
<include name="IDR_MAXIMIZE_H" file="linux_maximize_h.png" type="BINDATA" />
<include name="IDR_MAXIMIZE_P" file="linux_maximize_p.png" type="BINDATA" />
@@ -54,7 +54,7 @@
<include name="IDR_MINIMIZE_H" file="minimize_h.png" type="BINDATA" />
<include name="IDR_MINIMIZE_P" file="minimize_p.png" type="BINDATA" />
</if>
- <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5')">
+ <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
<include name="IDR_MINIMIZE" file="linux_minimize.png" type="BINDATA" />
<include name="IDR_MINIMIZE_H" file="linux_minimize_h.png" type="BINDATA" />
<include name="IDR_MINIMIZE_P" file="linux_minimize_p.png" type="BINDATA" />
@@ -64,7 +64,7 @@
<include name="IDR_RESTORE_H" file="restore_h.png" type="BINDATA" />
<include name="IDR_RESTORE_P" file="restore_p.png" type="BINDATA" />
</if>
- <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5')">
+ <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
<include name="IDR_RESTORE" file="linux_restore.png" type="BINDATA" />
<include name="IDR_RESTORE_H" file="linux_restore_h.png" type="BINDATA" />
<include name="IDR_RESTORE_P" file="linux_restore_p.png" type="BINDATA" />