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

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

Issue 2129413002: Use output_all_resource_defines=false in some chrome/ grd files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, address comment, more whitelist.cc cleanup Created 4 years, 5 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/address_input_strings.grd ('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 46433415606aec68b8ec14e0ec26550edcc5e6ec..be222e5f73a6c67fceb152764b2fbc3c7c274b8a 100644
--- a/chrome/app/theme/chrome_unscaled_resources.grd
+++ b/chrome/app/theme/chrome_unscaled_resources.grd
@@ -5,7 +5,7 @@
it is the caller's responsibility to do the right thing when the
display is not at 100P device scale factor.
-->
-<grit latest_public_release="0" current_release="1">
+<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<outputs>
<output filename="grit/chrome_unscaled_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
@@ -76,16 +76,18 @@
<if expr="is_linux and enable_app_list">
<!-- App Launcher icons for desktop icon. -->
<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 _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" />
- <include name="IDR_APP_LIST_256" file="chromium/linux/app_list_256.png" type="BINDATA" />
+ <then>
+ <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" />
+ </then>
+ <else>
+ <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" />
+ <include name="IDR_APP_LIST_256" file="chromium/linux/app_list_256.png" type="BINDATA" />
+ </else>
</if>
</if>
<if expr="is_macosx">
« no previous file with comments | « chrome/app/address_input_strings.grd ('k') | chrome/app/theme/theme_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698