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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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" output_all_resource_defines= "false">
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="_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" />
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 <include name="IDR_PROFILE_AVATAR_2X_21" file="default_200_percent/commo n/profile_avatar_dog.png" type="BINDATA" /> 69 <include name="IDR_PROFILE_AVATAR_2X_21" file="default_200_percent/commo n/profile_avatar_dog.png" type="BINDATA" />
70 <include name="IDR_PROFILE_AVATAR_2X_22" file="default_200_percent/commo n/profile_avatar_horse.png" type="BINDATA" /> 70 <include name="IDR_PROFILE_AVATAR_2X_22" file="default_200_percent/commo n/profile_avatar_horse.png" type="BINDATA" />
71 <include name="IDR_PROFILE_AVATAR_2X_23" file="default_200_percent/commo n/profile_avatar_margarita.png" type="BINDATA" /> 71 <include name="IDR_PROFILE_AVATAR_2X_23" file="default_200_percent/commo n/profile_avatar_margarita.png" type="BINDATA" />
72 <include name="IDR_PROFILE_AVATAR_2X_24" file="default_200_percent/commo n/profile_avatar_note.png" type="BINDATA" /> 72 <include name="IDR_PROFILE_AVATAR_2X_24" file="default_200_percent/commo n/profile_avatar_note.png" type="BINDATA" />
73 <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/commo n/profile_avatar_sun_cloud.png" type="BINDATA" /> 73 <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/commo n/profile_avatar_sun_cloud.png" type="BINDATA" />
74 <include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/commo n/profile_avatar_placeholder.png" type="BINDATA" /> 74 <include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/commo n/profile_avatar_placeholder.png" type="BINDATA" />
75 </if> 75 </if>
76 <if expr="is_linux and enable_app_list"> 76 <if expr="is_linux and enable_app_list">
77 <!-- App Launcher icons for desktop icon. --> 77 <!-- App Launcher icons for desktop icon. -->
78 <if expr="_google_chrome"> 78 <if expr="_google_chrome">
79 <include name="IDR_APP_LIST_16" file="google_chrome/linux/app_list_16. png" type="BINDATA" /> 79 <then>
80 <include name="IDR_APP_LIST_32" file="google_chrome/linux/app_list_32. png" type="BINDATA" /> 80 <include name="IDR_APP_LIST_16" file="google_chrome/linux/app_list_1 6.png" type="BINDATA" />
81 <include name="IDR_APP_LIST_48" file="google_chrome/linux/app_list_48. png" type="BINDATA" /> 81 <include name="IDR_APP_LIST_32" file="google_chrome/linux/app_list_3 2.png" type="BINDATA" />
82 <include name="IDR_APP_LIST_256" file="google_chrome/linux/app_list_25 6.png" type="BINDATA" /> 82 <include name="IDR_APP_LIST_48" file="google_chrome/linux/app_list_4 8.png" type="BINDATA" />
83 </if> 83 <include name="IDR_APP_LIST_256" file="google_chrome/linux/app_list_ 256.png" type="BINDATA" />
84 <if expr="not _google_chrome"> 84 </then>
85 <include name="IDR_APP_LIST_16" file="chromium/linux/app_list_16.png" type="BINDATA" /> 85 <else>
86 <include name="IDR_APP_LIST_32" file="chromium/linux/app_list_32.png" type="BINDATA" /> 86 <include name="IDR_APP_LIST_16" file="chromium/linux/app_list_16.png " type="BINDATA" />
87 <include name="IDR_APP_LIST_48" file="chromium/linux/app_list_48.png" type="BINDATA" /> 87 <include name="IDR_APP_LIST_32" file="chromium/linux/app_list_32.png " type="BINDATA" />
88 <include name="IDR_APP_LIST_256" file="chromium/linux/app_list_256.png " type="BINDATA" /> 88 <include name="IDR_APP_LIST_48" file="chromium/linux/app_list_48.png " type="BINDATA" />
89 <include name="IDR_APP_LIST_256" file="chromium/linux/app_list_256.p ng" type="BINDATA" />
90 </else>
89 </if> 91 </if>
90 </if> 92 </if>
91 <if expr="is_macosx"> 93 <if expr="is_macosx">
92 <include name="IDR_APPS_FOLDER_16" file="mac/apps_folder_16.png" type="B INDATA" /> 94 <include name="IDR_APPS_FOLDER_16" file="mac/apps_folder_16.png" type="B INDATA" />
93 <include name="IDR_APPS_FOLDER_32" file="mac/apps_folder_32.png" type="B INDATA" /> 95 <include name="IDR_APPS_FOLDER_32" file="mac/apps_folder_32.png" type="B INDATA" />
94 <include name="IDR_APPS_FOLDER_OVERLAY_128" file="mac/apps_folder_overla y_128.png" type="BINDATA" /> 96 <include name="IDR_APPS_FOLDER_OVERLAY_128" file="mac/apps_folder_overla y_128.png" type="BINDATA" />
95 <include name="IDR_APPS_FOLDER_OVERLAY_512" file="mac/apps_folder_overla y_512.png" type="BINDATA" /> 97 <include name="IDR_APPS_FOLDER_OVERLAY_512" file="mac/apps_folder_overla y_512.png" type="BINDATA" />
96 </if> 98 </if>
97 <if expr="chromeos"> 99 <if expr="chromeos">
98 <!-- TODO(dzhioev): Remove when we have Roboto among system fonts. 100 <!-- TODO(dzhioev): Remove when we have Roboto among system fonts.
99 http://crbug.com/409047 --> 101 http://crbug.com/409047 -->
100 <include name="IDR_FONT_ROBOTO_THIN" file="Roboto-Thin.ttf" type="BINDAT A" /> 102 <include name="IDR_FONT_ROBOTO_THIN" file="Roboto-Thin.ttf" type="BINDAT A" />
101 <include name="IDR_FONT_ROBOTO_LIGHT" file="Roboto-Light.ttf" type="BIND ATA" /> 103 <include name="IDR_FONT_ROBOTO_LIGHT" file="Roboto-Light.ttf" type="BIND ATA" />
102 <include name="IDR_FONT_ROBOTO_REGULAR" file="Roboto-Regular.ttf" type=" BINDATA" /> 104 <include name="IDR_FONT_ROBOTO_REGULAR" file="Roboto-Regular.ttf" type=" BINDATA" />
103 <include name="IDR_FONT_ROBOTO_MEDIUM" file="Roboto-Medium.ttf" type="BI NDATA" /> 105 <include name="IDR_FONT_ROBOTO_MEDIUM" file="Roboto-Medium.ttf" type="BI NDATA" />
104 <include name="IDR_FONT_ROBOTO_BOLD" file="Roboto-Bold.ttf" type="BINDAT A" /> 106 <include name="IDR_FONT_ROBOTO_BOLD" file="Roboto-Bold.ttf" type="BINDAT A" />
105 </if> 107 </if>
106 </includes> 108 </includes>
107 </release> 109 </release>
108 </grit> 110 </grit>
OLDNEW
« 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