Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1731)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/theme/chrome_unscaled_resources.grd

Issue 171673004: Remove pp_ifdef from resource files in chrome/app/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/resources/platform_locale_settings/locale_settings_cros_zh-TW.xtb ('k') | chrome/app/theme/theme_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/theme/chrome_unscaled_resources.grd
diff --git a/chrome/app/theme/chrome_unscaled_resources.grd b/chrome/app/theme/chrome_unscaled_resources.grd
index 8a582ce5d7a0da8e0d7fa42c42107ecf7b0f30b4..ee53f9eae0d073616d691298b7e7a25222168deb 100644
--- a/chrome/app/theme/chrome_unscaled_resources.grd
+++ b/chrome/app/theme/chrome_unscaled_resources.grd
@@ -14,7 +14,7 @@
</outputs>
<release seq="1">
<includes>
- <if expr="pp_ifdef('_google_chrome')">
+ <if expr="_google_chrome">
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_128.png" type="BINDATA" />
<!-- NOTE: product_logo_*.* files beyond what's listed above are
@@ -29,7 +29,7 @@
<include name="IDR_STATUS_TRAY_ICON_PRESSED" file="google_chrome/product_logo_22.png" type="BINDATA" />
</if>
</if>
- <if expr="not pp_ifdef('_google_chrome')">
+ <if expr="not _google_chrome">
<include name="IDR_PRODUCT_LOGO_64" file="chromium/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="chromium/product_logo_128.png" type="BINDATA" />
<!-- NOTE: product_logo_*.* files beyond what's listed above are
@@ -76,10 +76,10 @@
<include name="IDR_PROFILE_AVATAR_2X_24" file="default_200_percent/profile_avatar_note.png" type="BINDATA" />
<include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/profile_avatar_sun_cloud.png" type="BINDATA" />
</if>
- <if expr="is_macosx and pp_ifdef('enable_app_list')">
+ <if expr="is_macosx and enable_app_list">
<!-- App Launcher icons for .app shim, dock icon. Unscaled, because the
icon file built does not depend on UI scale factor. -->
- <if expr="pp_ifdef('_google_chrome')">
+ <if expr="_google_chrome">
<include name="IDR_APP_LIST_16" file="google_chrome/mac/app_list_16.png" type="BINDATA" />
<include name="IDR_APP_LIST_32" file="google_chrome/mac/app_list_32.png" type="BINDATA" />
<include name="IDR_APP_LIST_128" file="google_chrome/mac/app_list_128.png" type="BINDATA" />
@@ -89,22 +89,22 @@
<include name="IDR_APP_LIST_CANARY_128" file="google_chrome/mac/app_list_canary_128.png" type="BINDATA" />
<include name="IDR_APP_LIST_CANARY_256" file="google_chrome/mac/app_list_canary_256.png" type="BINDATA" />
</if>
- <if expr="not pp_ifdef('_google_chrome')">
+ <if expr="not _google_chrome">
<include name="IDR_APP_LIST_16" file="chromium/mac/app_list_16.png" type="BINDATA" />
<include name="IDR_APP_LIST_32" file="chromium/mac/app_list_32.png" type="BINDATA" />
<include name="IDR_APP_LIST_128" file="chromium/mac/app_list_128.png" type="BINDATA" />
<include name="IDR_APP_LIST_256" file="chromium/mac/app_list_256.png" type="BINDATA" />
</if>
</if>
- <if expr="is_linux and pp_ifdef('enable_app_list')">
+ <if expr="is_linux and enable_app_list">
<!-- App Launcher icons for desktop icon. -->
- <if expr="pp_ifdef('_google_chrome')">
+ <if expr="_google_chrome">
<include name="IDR_APP_LIST_16" file="google_chrome/linux/app_list_16.png" type="BINDATA" />
<include name="IDR_APP_LIST_32" file="google_chrome/linux/app_list_32.png" type="BINDATA" />
<include name="IDR_APP_LIST_48" file="google_chrome/linux/app_list_48.png" type="BINDATA" />
<include name="IDR_APP_LIST_256" file="google_chrome/linux/app_list_256.png" type="BINDATA" />
</if>
- <if expr="not pp_ifdef('_google_chrome')">
+ <if expr="not _google_chrome">
<include name="IDR_APP_LIST_16" file="chromium/linux/app_list_16.png" type="BINDATA" />
<include name="IDR_APP_LIST_32" file="chromium/linux/app_list_32.png" type="BINDATA" />
<include name="IDR_APP_LIST_48" file="chromium/linux/app_list_48.png" type="BINDATA" />
« no previous file with comments | « chrome/app/resources/platform_locale_settings/locale_settings_cros_zh-TW.xtb ('k') | chrome/app/theme/theme_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698