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

Side by Side Diff: chrome/app/theme/chrome_unscaled_resources.grd

Issue 2131463002: Purge the App Launcher code from Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Zap mac-specific icon assets 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 | « no previous file | chrome/app/theme/chromium/mac/app_list_128.png » ('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">
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">
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 <include name="IDR_PROFILE_AVATAR_2X_18" file="default_200_percent/commo n/profile_avatar_burger.png" type="BINDATA" /> 66 <include name="IDR_PROFILE_AVATAR_2X_18" file="default_200_percent/commo n/profile_avatar_burger.png" type="BINDATA" />
67 <include name="IDR_PROFILE_AVATAR_2X_19" file="default_200_percent/commo n/profile_avatar_cat.png" type="BINDATA" /> 67 <include name="IDR_PROFILE_AVATAR_2X_19" file="default_200_percent/commo n/profile_avatar_cat.png" type="BINDATA" />
68 <include name="IDR_PROFILE_AVATAR_2X_20" file="default_200_percent/commo n/profile_avatar_cupcake.png" type="BINDATA" /> 68 <include name="IDR_PROFILE_AVATAR_2X_20" file="default_200_percent/commo n/profile_avatar_cupcake.png" type="BINDATA" />
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_macosx and enable_app_list">
77 <!-- App Launcher icons for .app shim, dock icon. Unscaled, because the
78 icon file built does not depend on UI scale factor. -->
79 <if expr="_google_chrome">
80 <include name="IDR_APP_LIST_16" file="google_chrome/mac/app_list_16.pn g" type="BINDATA" />
tapted 2016/07/07 06:31:14 CL for these is http://go/chromerev/458557013/
81 <include name="IDR_APP_LIST_32" file="google_chrome/mac/app_list_32.pn g" type="BINDATA" />
82 <include name="IDR_APP_LIST_128" file="google_chrome/mac/app_list_128. png" type="BINDATA" />
83 <include name="IDR_APP_LIST_256" file="google_chrome/mac/app_list_256. png" type="BINDATA" />
84 <include name="IDR_APP_LIST_CANARY_16" file="google_chrome/mac/app_lis t_canary_16.png" type="BINDATA" />
85 <include name="IDR_APP_LIST_CANARY_32" file="google_chrome/mac/app_lis t_canary_32.png" type="BINDATA" />
86 <include name="IDR_APP_LIST_CANARY_128" file="google_chrome/mac/app_li st_canary_128.png" type="BINDATA" />
87 <include name="IDR_APP_LIST_CANARY_256" file="google_chrome/mac/app_li st_canary_256.png" type="BINDATA" />
88 </if>
89 <if expr="not _google_chrome">
90 <include name="IDR_APP_LIST_16" file="chromium/mac/app_list_16.png" ty pe="BINDATA" />
91 <include name="IDR_APP_LIST_32" file="chromium/mac/app_list_32.png" ty pe="BINDATA" />
92 <include name="IDR_APP_LIST_128" file="chromium/mac/app_list_128.png" type="BINDATA" />
93 <include name="IDR_APP_LIST_256" file="chromium/mac/app_list_256.png" type="BINDATA" />
94 </if>
95 </if>
96 <if expr="is_linux and enable_app_list"> 76 <if expr="is_linux and enable_app_list">
97 <!-- App Launcher icons for desktop icon. --> 77 <!-- App Launcher icons for desktop icon. -->
98 <if expr="_google_chrome"> 78 <if expr="_google_chrome">
99 <include name="IDR_APP_LIST_16" file="google_chrome/linux/app_list_16. png" type="BINDATA" /> 79 <include name="IDR_APP_LIST_16" file="google_chrome/linux/app_list_16. png" type="BINDATA" />
100 <include name="IDR_APP_LIST_32" file="google_chrome/linux/app_list_32. png" type="BINDATA" /> 80 <include name="IDR_APP_LIST_32" file="google_chrome/linux/app_list_32. png" type="BINDATA" />
101 <include name="IDR_APP_LIST_48" file="google_chrome/linux/app_list_48. png" type="BINDATA" /> 81 <include name="IDR_APP_LIST_48" file="google_chrome/linux/app_list_48. png" type="BINDATA" />
102 <include name="IDR_APP_LIST_256" file="google_chrome/linux/app_list_25 6.png" type="BINDATA" /> 82 <include name="IDR_APP_LIST_256" file="google_chrome/linux/app_list_25 6.png" type="BINDATA" />
103 </if> 83 </if>
104 <if expr="not _google_chrome"> 84 <if expr="not _google_chrome">
105 <include name="IDR_APP_LIST_16" file="chromium/linux/app_list_16.png" type="BINDATA" /> 85 <include name="IDR_APP_LIST_16" file="chromium/linux/app_list_16.png" type="BINDATA" />
(...skipping 13 matching lines...) Expand all
119 http://crbug.com/409047 --> 99 http://crbug.com/409047 -->
120 <include name="IDR_FONT_ROBOTO_THIN" file="Roboto-Thin.ttf" type="BINDAT A" /> 100 <include name="IDR_FONT_ROBOTO_THIN" file="Roboto-Thin.ttf" type="BINDAT A" />
121 <include name="IDR_FONT_ROBOTO_LIGHT" file="Roboto-Light.ttf" type="BIND ATA" /> 101 <include name="IDR_FONT_ROBOTO_LIGHT" file="Roboto-Light.ttf" type="BIND ATA" />
122 <include name="IDR_FONT_ROBOTO_REGULAR" file="Roboto-Regular.ttf" type=" BINDATA" /> 102 <include name="IDR_FONT_ROBOTO_REGULAR" file="Roboto-Regular.ttf" type=" BINDATA" />
123 <include name="IDR_FONT_ROBOTO_MEDIUM" file="Roboto-Medium.ttf" type="BI NDATA" /> 103 <include name="IDR_FONT_ROBOTO_MEDIUM" file="Roboto-Medium.ttf" type="BI NDATA" />
124 <include name="IDR_FONT_ROBOTO_BOLD" file="Roboto-Bold.ttf" type="BINDAT A" /> 104 <include name="IDR_FONT_ROBOTO_BOLD" file="Roboto-Bold.ttf" type="BINDAT A" />
125 </if> 105 </if>
126 </includes> 106 </includes>
127 </release> 107 </release>
128 </grit> 108 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/theme/chromium/mac/app_list_128.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698