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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- This grd file contains images that are not pre-scaled for device 2 <!-- This grd file contains images that are not pre-scaled for device
3 scale factors. The image returned by 3 scale factors. The image returned by
4 |base::ResourceBundle::GetImageNamed| only contains 100P, and 4 |base::ResourceBundle::GetImageNamed| only contains 100P, and
5 it is the caller's responsibility to do the right thing when the 5 it is the caller's responsibility to do the right thing when the
6 display is not at 100P device scale factor. 6 display is not at 100P device scale factor.
7 --> 7 -->
8 <grit latest_public_release="0" current_release="1"> 8 <grit latest_public_release="0" current_release="1">
9 <outputs> 9 <outputs>
10 <output filename="grit/chrome_unscaled_resources.h" type="rc_header"> 10 <output filename="grit/chrome_unscaled_resources.h" type="rc_header">
11 <emit emit_type='prepend'></emit> 11 <emit emit_type='prepend'></emit>
12 </output> 12 </output>
13 <output filename="chrome_unscaled_resources.pak" type="data_package" /> 13 <output filename="chrome_unscaled_resources.pak" type="data_package" />
14 </outputs> 14 </outputs>
15 <release seq="1"> 15 <release seq="1">
16 <includes> 16 <includes>
17 <if expr="pp_ifdef('_google_chrome')"> 17 <if expr="_google_chrome">
18 <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64. png" type="BINDATA" /> 18 <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64. png" type="BINDATA" />
19 <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_12 8.png" type="BINDATA" /> 19 <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_12 8.png" type="BINDATA" />
20 <!-- NOTE: product_logo_*.* files beyond what's listed above are 20 <!-- NOTE: product_logo_*.* files beyond what's listed above are
21 referenced by installer code; don't remove them unless you know 21 referenced by installer code; don't remove them unless you know
22 what you're doing! --> 22 what you're doing! -->
23 <if expr="is_macosx"> 23 <if expr="is_macosx">
24 <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_ 22_mono.png" type="BINDATA" /> 24 <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_ 22_mono.png" type="BINDATA" />
25 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="google_chrome/produ ct_logo_22_mono_invert.png" type="BINDATA" /> 25 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="google_chrome/produ ct_logo_22_mono_invert.png" type="BINDATA" />
26 </if> 26 </if>
27 <if expr="not is_macosx"> 27 <if expr="not is_macosx">
28 <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_ 22.png" type="BINDATA" /> 28 <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_ 22.png" type="BINDATA" />
29 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="google_chrome/produ ct_logo_22.png" type="BINDATA" /> 29 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="google_chrome/produ ct_logo_22.png" type="BINDATA" />
30 </if> 30 </if>
31 </if> 31 </if>
32 <if expr="not pp_ifdef('_google_chrome')"> 32 <if expr="not _google_chrome">
33 <include name="IDR_PRODUCT_LOGO_64" file="chromium/product_logo_64.png" type="BINDATA" /> 33 <include name="IDR_PRODUCT_LOGO_64" file="chromium/product_logo_64.png" type="BINDATA" />
34 <include name="IDR_PRODUCT_LOGO_128" file="chromium/product_logo_128.png " type="BINDATA" /> 34 <include name="IDR_PRODUCT_LOGO_128" file="chromium/product_logo_128.png " type="BINDATA" />
35 <!-- NOTE: product_logo_*.* files beyond what's listed above are 35 <!-- NOTE: product_logo_*.* files beyond what's listed above are
36 referenced by installer code; don't remove them unless you know 36 referenced by installer code; don't remove them unless you know
37 what you're doing! --> 37 what you're doing! -->
38 <if expr="is_macosx"> 38 <if expr="is_macosx">
39 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22_mo no.png" type="BINDATA" /> 39 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22_mo no.png" type="BINDATA" />
40 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22_mono_invert.png" type="BINDATA" /> 40 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22_mono_invert.png" type="BINDATA" />
41 </if> 41 </if>
42 <if expr="not is_macosx"> 42 <if expr="not is_macosx">
(...skipping 26 matching lines...) Expand all
69 <include name="IDR_PROFILE_AVATAR_2X_17" file="default_200_percent/profi le_avatar_soccer.png" type="BINDATA" /> 69 <include name="IDR_PROFILE_AVATAR_2X_17" file="default_200_percent/profi le_avatar_soccer.png" type="BINDATA" />
70 <include name="IDR_PROFILE_AVATAR_2X_18" file="default_200_percent/profi le_avatar_burger.png" type="BINDATA" /> 70 <include name="IDR_PROFILE_AVATAR_2X_18" file="default_200_percent/profi le_avatar_burger.png" type="BINDATA" />
71 <include name="IDR_PROFILE_AVATAR_2X_19" file="default_200_percent/profi le_avatar_cat.png" type="BINDATA" /> 71 <include name="IDR_PROFILE_AVATAR_2X_19" file="default_200_percent/profi le_avatar_cat.png" type="BINDATA" />
72 <include name="IDR_PROFILE_AVATAR_2X_20" file="default_200_percent/profi le_avatar_cupcake.png" type="BINDATA" /> 72 <include name="IDR_PROFILE_AVATAR_2X_20" file="default_200_percent/profi le_avatar_cupcake.png" type="BINDATA" />
73 <include name="IDR_PROFILE_AVATAR_2X_21" file="default_200_percent/profi le_avatar_dog.png" type="BINDATA" /> 73 <include name="IDR_PROFILE_AVATAR_2X_21" file="default_200_percent/profi le_avatar_dog.png" type="BINDATA" />
74 <include name="IDR_PROFILE_AVATAR_2X_22" file="default_200_percent/profi le_avatar_horse.png" type="BINDATA" /> 74 <include name="IDR_PROFILE_AVATAR_2X_22" file="default_200_percent/profi le_avatar_horse.png" type="BINDATA" />
75 <include name="IDR_PROFILE_AVATAR_2X_23" file="default_200_percent/profi le_avatar_margarita.png" type="BINDATA" /> 75 <include name="IDR_PROFILE_AVATAR_2X_23" file="default_200_percent/profi le_avatar_margarita.png" type="BINDATA" />
76 <include name="IDR_PROFILE_AVATAR_2X_24" file="default_200_percent/profi le_avatar_note.png" type="BINDATA" /> 76 <include name="IDR_PROFILE_AVATAR_2X_24" file="default_200_percent/profi le_avatar_note.png" type="BINDATA" />
77 <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/profi le_avatar_sun_cloud.png" type="BINDATA" /> 77 <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/profi le_avatar_sun_cloud.png" type="BINDATA" />
78 </if> 78 </if>
79 <if expr="is_macosx and pp_ifdef('enable_app_list')"> 79 <if expr="is_macosx and enable_app_list">
80 <!-- App Launcher icons for .app shim, dock icon. Unscaled, because the 80 <!-- App Launcher icons for .app shim, dock icon. Unscaled, because the
81 icon file built does not depend on UI scale factor. --> 81 icon file built does not depend on UI scale factor. -->
82 <if expr="pp_ifdef('_google_chrome')"> 82 <if expr="_google_chrome">
83 <include name="IDR_APP_LIST_16" file="google_chrome/mac/app_list_16.pn g" type="BINDATA" /> 83 <include name="IDR_APP_LIST_16" file="google_chrome/mac/app_list_16.pn g" type="BINDATA" />
84 <include name="IDR_APP_LIST_32" file="google_chrome/mac/app_list_32.pn g" type="BINDATA" /> 84 <include name="IDR_APP_LIST_32" file="google_chrome/mac/app_list_32.pn g" type="BINDATA" />
85 <include name="IDR_APP_LIST_128" file="google_chrome/mac/app_list_128. png" type="BINDATA" /> 85 <include name="IDR_APP_LIST_128" file="google_chrome/mac/app_list_128. png" type="BINDATA" />
86 <include name="IDR_APP_LIST_256" file="google_chrome/mac/app_list_256. png" type="BINDATA" /> 86 <include name="IDR_APP_LIST_256" file="google_chrome/mac/app_list_256. png" type="BINDATA" />
87 <include name="IDR_APP_LIST_CANARY_16" file="google_chrome/mac/app_lis t_canary_16.png" type="BINDATA" /> 87 <include name="IDR_APP_LIST_CANARY_16" file="google_chrome/mac/app_lis t_canary_16.png" type="BINDATA" />
88 <include name="IDR_APP_LIST_CANARY_32" file="google_chrome/mac/app_lis t_canary_32.png" type="BINDATA" /> 88 <include name="IDR_APP_LIST_CANARY_32" file="google_chrome/mac/app_lis t_canary_32.png" type="BINDATA" />
89 <include name="IDR_APP_LIST_CANARY_128" file="google_chrome/mac/app_li st_canary_128.png" type="BINDATA" /> 89 <include name="IDR_APP_LIST_CANARY_128" file="google_chrome/mac/app_li st_canary_128.png" type="BINDATA" />
90 <include name="IDR_APP_LIST_CANARY_256" file="google_chrome/mac/app_li st_canary_256.png" type="BINDATA" /> 90 <include name="IDR_APP_LIST_CANARY_256" file="google_chrome/mac/app_li st_canary_256.png" type="BINDATA" />
91 </if> 91 </if>
92 <if expr="not pp_ifdef('_google_chrome')"> 92 <if expr="not _google_chrome">
93 <include name="IDR_APP_LIST_16" file="chromium/mac/app_list_16.png" ty pe="BINDATA" /> 93 <include name="IDR_APP_LIST_16" file="chromium/mac/app_list_16.png" ty pe="BINDATA" />
94 <include name="IDR_APP_LIST_32" file="chromium/mac/app_list_32.png" ty pe="BINDATA" /> 94 <include name="IDR_APP_LIST_32" file="chromium/mac/app_list_32.png" ty pe="BINDATA" />
95 <include name="IDR_APP_LIST_128" file="chromium/mac/app_list_128.png" type="BINDATA" /> 95 <include name="IDR_APP_LIST_128" file="chromium/mac/app_list_128.png" type="BINDATA" />
96 <include name="IDR_APP_LIST_256" file="chromium/mac/app_list_256.png" type="BINDATA" /> 96 <include name="IDR_APP_LIST_256" file="chromium/mac/app_list_256.png" type="BINDATA" />
97 </if> 97 </if>
98 </if> 98 </if>
99 <if expr="is_linux and pp_ifdef('enable_app_list')"> 99 <if expr="is_linux and enable_app_list">
100 <!-- App Launcher icons for desktop icon. --> 100 <!-- App Launcher icons for desktop icon. -->
101 <if expr="pp_ifdef('_google_chrome')"> 101 <if expr="_google_chrome">
102 <include name="IDR_APP_LIST_16" file="google_chrome/linux/app_list_16. png" type="BINDATA" /> 102 <include name="IDR_APP_LIST_16" file="google_chrome/linux/app_list_16. png" type="BINDATA" />
103 <include name="IDR_APP_LIST_32" file="google_chrome/linux/app_list_32. png" type="BINDATA" /> 103 <include name="IDR_APP_LIST_32" file="google_chrome/linux/app_list_32. png" type="BINDATA" />
104 <include name="IDR_APP_LIST_48" file="google_chrome/linux/app_list_48. png" type="BINDATA" /> 104 <include name="IDR_APP_LIST_48" file="google_chrome/linux/app_list_48. png" type="BINDATA" />
105 <include name="IDR_APP_LIST_256" file="google_chrome/linux/app_list_25 6.png" type="BINDATA" /> 105 <include name="IDR_APP_LIST_256" file="google_chrome/linux/app_list_25 6.png" type="BINDATA" />
106 </if> 106 </if>
107 <if expr="not pp_ifdef('_google_chrome')"> 107 <if expr="not _google_chrome">
108 <include name="IDR_APP_LIST_16" file="chromium/linux/app_list_16.png" type="BINDATA" /> 108 <include name="IDR_APP_LIST_16" file="chromium/linux/app_list_16.png" type="BINDATA" />
109 <include name="IDR_APP_LIST_32" file="chromium/linux/app_list_32.png" type="BINDATA" /> 109 <include name="IDR_APP_LIST_32" file="chromium/linux/app_list_32.png" type="BINDATA" />
110 <include name="IDR_APP_LIST_48" file="chromium/linux/app_list_48.png" type="BINDATA" /> 110 <include name="IDR_APP_LIST_48" file="chromium/linux/app_list_48.png" type="BINDATA" />
111 <include name="IDR_APP_LIST_256" file="chromium/linux/app_list_256.png " type="BINDATA" /> 111 <include name="IDR_APP_LIST_256" file="chromium/linux/app_list_256.png " type="BINDATA" />
112 </if> 112 </if>
113 </if> 113 </if>
114 <if expr="is_macosx"> 114 <if expr="is_macosx">
115 <include name="IDR_APPS_FOLDER_OVERLAY_16" file="mac/apps_folder_overlay _16.png" type="BINDATA" /> 115 <include name="IDR_APPS_FOLDER_OVERLAY_16" file="mac/apps_folder_overlay _16.png" type="BINDATA" />
116 <include name="IDR_APPS_FOLDER_OVERLAY_32" file="mac/apps_folder_overlay _32.png" type="BINDATA" /> 116 <include name="IDR_APPS_FOLDER_OVERLAY_32" file="mac/apps_folder_overlay _32.png" type="BINDATA" />
117 <include name="IDR_APPS_FOLDER_OVERLAY_128" file="mac/apps_folder_overla y_128.png" type="BINDATA" /> 117 <include name="IDR_APPS_FOLDER_OVERLAY_128" file="mac/apps_folder_overla y_128.png" type="BINDATA" />
118 <include name="IDR_APPS_FOLDER_OVERLAY_512" file="mac/apps_folder_overla y_512.png" type="BINDATA" /> 118 <include name="IDR_APPS_FOLDER_OVERLAY_512" file="mac/apps_folder_overla y_512.png" type="BINDATA" />
119 </if> 119 </if>
120 </includes> 120 </includes>
121 </release> 121 </release>
122 </grit> 122 </grit>
OLDNEW
« 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