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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 209433005: Use same icon set to be consistent in Files.app and Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase onto head. Created 6 years, 8 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/theme/default_200_percent/cros/file_types/word_white.png ('k') | chrome/browser/icon_loader_chromeos.cc » ('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 pre-scaled for device scale 2 <!-- This grd file contains images that are pre-scaled for device scale
3 factors. The image returned by |base::ResourceBundle::GetImageNamed| 3 factors. The image returned by |base::ResourceBundle::GetImageNamed|
4 will contain multiple |gfx:ImageSkiaReps| for each scale factors. The 4 will contain multiple |gfx:ImageSkiaReps| for each scale factors. The
5 |fallback_to_low_resolution| attribute controls behavior when 5 |fallback_to_low_resolution| attribute controls behavior when
6 an image file is missing for target scale factor. If true, chrome 6 an image file is missing for target scale factor. If true, chrome
7 will automatically scale the 1x image to the target scale factor. 7 will automatically scale the 1x image to the target scale factor.
8 If false, build will fail due to missing resources. This is 8 If false, build will fail due to missing resources. This is
9 currently set to true for all resources, but the default will 9 currently set to true for all resources, but the default will
10 become false in near future. 10 become false in near future.
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 </if> 240 </if>
241 <if expr="chromeos"> 241 <if expr="chromeos">
242 <structure type="chrome_scaled_image" name="IDR_FATAL_ERROR" file="cros/ fatal_error.png" /> 242 <structure type="chrome_scaled_image" name="IDR_FATAL_ERROR" file="cros/ fatal_error.png" />
243 </if> 243 </if>
244 <structure type="chrome_scaled_image" name="IDR_FEEDBACK" file="feedback.p ng" /> 244 <structure type="chrome_scaled_image" name="IDR_FEEDBACK" file="feedback.p ng" />
245 <structure type="chrome_scaled_image" name="IDR_FEEDBACK_H" file="feedback _hover.png" /> 245 <structure type="chrome_scaled_image" name="IDR_FEEDBACK_H" file="feedback _hover.png" />
246 <structure type="chrome_scaled_image" name="IDR_FEEDBACK_P" file="feedback _pressed.png" /> 246 <structure type="chrome_scaled_image" name="IDR_FEEDBACK_P" file="feedback _pressed.png" />
247 247
248 <structure type="chrome_scaled_image" name="IDR_FILE_FOLDER" file="common/ folder.png" /> 248 <structure type="chrome_scaled_image" name="IDR_FILE_FOLDER" file="common/ folder.png" />
249 <if expr="chromeos"> 249 <if expr="chromeos">
250 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_ARCHIVE" file="cros/file_types/archive.png" /> 250 <structure type="chrome_scaled_image" name="IDR_FILETYPE_ARCHIVE" file=" cros/file_types/archive.png" />
251 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_AUDIO" file="cros/file_types/audio.png" /> 251 <structure type="chrome_scaled_image" name="IDR_FILETYPE_ARCHIVE_WHITE" file="cros/file_types/archive_white.png" />
252 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_DRIVE" file="cros/file_types/drive.png" /> 252 <structure type="chrome_scaled_image" name="IDR_FILETYPE_AUDIO" file="cr os/file_types/audio.png" />
253 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_EXCEL" file="cros/file_types/excel.png" /> 253 <structure type="chrome_scaled_image" name="IDR_FILETYPE_AUDIO_WHITE" fi le="cros/file_types/audio_white.png" />
254 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_FORM" file="cros/file_types/form.png" /> 254 <structure type="chrome_scaled_image" name="IDR_FILETYPE_DRIVE" file="cr os/file_types/drive.png" />
255 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_GDOC" file="cros/file_types/gdoc.png" /> 255 <structure type="chrome_scaled_image" name="IDR_FILETYPE_EXCEL" file="cr os/file_types/excel.png" />
256 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_GDRAW" file="cros/file_types/gdraw.png" /> 256 <structure type="chrome_scaled_image" name="IDR_FILETYPE_EXCEL_WHITE" fi le="cros/file_types/excel_white.png" />
257 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_GENERIC" file="cros/file_types/generic.png" /> 257 <structure type="chrome_scaled_image" name="IDR_FILETYPE_FOLDER" file="c ros/file_types/folder.png" />
258 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_GLINK" file="cros/file_types/glink.png" /> 258 <structure type="chrome_scaled_image" name="IDR_FILETYPE_FOLDER_WHITE" f ile="cros/file_types/folder_white.png" />
259 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_GSHEET" file="cros/file_types/gsheet.png" /> 259 <structure type="chrome_scaled_image" name="IDR_FILETYPE_FORM" file="cro s/file_types/form.png" />
260 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_GSLIDES" file="cros/file_types/gslides.png" /> 260 <structure type="chrome_scaled_image" name="IDR_FILETYPE_FORM_WHITE" fil e="cros/file_types/form_white.png" />
261 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_GTABLE" file="cros/file_types/gtable.png" /> 261 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GDOC" file="cro s/file_types/gdoc.png" />
262 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_IMAGE" file="cros/file_types/image.png" /> 262 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GDOC_WHITE" fil e="cros/file_types/gdoc_white.png" />
263 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_PDF" file="cros/file_types/pdf.png" /> 263 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GDRAW" file="cr os/file_types/gdraw.png" />
264 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_PPT" file="cros/file_types/ppt.png" /> 264 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GDRAW_WHITE" fi le="cros/file_types/gdraw_white.png" />
265 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_SCRIPT" file="cros/file_types/script.png" /> 265 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GENERIC" file=" cros/file_types/generic.png" />
266 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_SITES" file="cros/file_types/sites.png" /> 266 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GENERIC_WHITE" file="cros/file_types/generic_white.png" />
267 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_VIDEO" file="cros/file_types/video.png" /> 267 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GLINK" file="cr os/file_types/glink.png" />
268 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_WORD" file="cros/file_types/word.png" /> 268 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GLINK_WHITE" fi le="cros/file_types/glink_white.png" />
269 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_LARGE_AUDIO" file="cros/file_types/thumbnails/audio.png" /> 269 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GSHEET" file="c ros/file_types/gsheet.png" />
270 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_LARGE_FOLDER" file="cros/file_types/thumbnails/folder.png" /> 270 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GSHEET_WHITE" f ile="cros/file_types/gsheet_white.png" />
271 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_LARGE_GENERIC" file="cros/file_types/thumbnails/generic.png" /> 271 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GSLIDES" file=" cros/file_types/gslides.png" />
272 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_LARGE_IMAGE" file="cros/file_types/thumbnails/image.png" /> 272 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GSLIDES_WHITE" file="cros/file_types/gslides_white.png" />
273 <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYP E_LARGE_VIDEO" file="cros/file_types/thumbnails/video.png" /> 273 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GTABLE" file="c ros/file_types/gtable.png" />
274 <structure type="chrome_scaled_image" name="IDR_FILETYPE_GTABLE_WHITE" f ile="cros/file_types/gtable_white.png" />
275 <structure type="chrome_scaled_image" name="IDR_FILETYPE_IMAGE" file="cr os/file_types/image.png" />
276 <structure type="chrome_scaled_image" name="IDR_FILETYPE_IMAGE_WHITE" fi le="cros/file_types/image_white.png" />
277 <structure type="chrome_scaled_image" name="IDR_FILETYPE_PDF" file="cros /file_types/pdf.png" />
278 <structure type="chrome_scaled_image" name="IDR_FILETYPE_PDF_WHITE" file ="cros/file_types/pdf_white.png" />
279 <structure type="chrome_scaled_image" name="IDR_FILETYPE_PPT" file="cros /file_types/ppt.png" />
280 <structure type="chrome_scaled_image" name="IDR_FILETYPE_PPT_WHITE" file ="cros/file_types/ppt_white.png" />
281 <structure type="chrome_scaled_image" name="IDR_FILETYPE_SCRIPT" file="c ros/file_types/script.png" />
282 <structure type="chrome_scaled_image" name="IDR_FILETYPE_SCRIPT_WHITE" f ile="cros/file_types/script_white.png" />
283 <structure type="chrome_scaled_image" name="IDR_FILETYPE_SITES" file="cr os/file_types/sites.png" />
284 <structure type="chrome_scaled_image" name="IDR_FILETYPE_SITES_WHITE" fi le="cros/file_types/sites_white.png" />
285 <structure type="chrome_scaled_image" name="IDR_FILETYPE_VIDEO" file="cr os/file_types/video.png" />
286 <structure type="chrome_scaled_image" name="IDR_FILETYPE_VIDEO_WHITE" fi le="cros/file_types/video_white.png" />
287 <structure type="chrome_scaled_image" name="IDR_FILETYPE_WORD" file="cro s/file_types/word.png" />
288 <structure type="chrome_scaled_image" name="IDR_FILETYPE_WORD_WHITE" fil e="cros/file_types/word_white.png" />
289 <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_AUDIO" fi le="cros/file_types/thumbnails/audio.png" />
290 <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_FOLDER" f ile="cros/file_types/thumbnails/folder.png" />
291 <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_GENERIC" file="cros/file_types/thumbnails/generic.png" />
292 <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_IMAGE" fi le="cros/file_types/thumbnails/image.png" />
293 <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_VIDEO" fi le="cros/file_types/thumbnails/video.png" />
274 </if> 294 </if>
275 295
276 <if expr="chromeos"> 296 <if expr="chromeos">
277 <structure type="chrome_scaled_image" name="IDR_FILES_APP_ICON" file="co mmon/files_app_icon.png" /> 297 <structure type="chrome_scaled_image" name="IDR_FILES_APP_ICON" file="co mmon/files_app_icon.png" />
278 <if expr="_google_chrome"> 298 <if expr="_google_chrome">
279 <structure type="chrome_scaled_image" name="IDR_FIRST_RUN_GREETING" fi le="google_chrome/cros/first_run_greeting.png" /> 299 <structure type="chrome_scaled_image" name="IDR_FIRST_RUN_GREETING" fi le="google_chrome/cros/first_run_greeting.png" />
280 </if> 300 </if>
281 <structure type="chrome_scaled_image" name="IDR_FIRST_RUN_COMPLETION" fi le="cros/first_run_completion.png" /> 301 <structure type="chrome_scaled_image" name="IDR_FIRST_RUN_COMPLETION" fi le="cros/first_run_completion.png" />
282 </if> 302 </if>
283 <structure type="chrome_scaled_image" name="IDR_FINDINPAGE_NEXT" file="com mon/find_next.png" /> 303 <structure type="chrome_scaled_image" name="IDR_FINDINPAGE_NEXT" file="com mon/find_next.png" />
(...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after
1306 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1326 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1307 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1327 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1308 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1328 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1309 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1329 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1310 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1330 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1311 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1331 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1312 1332
1313 </structures> 1333 </structures>
1314 </release> 1334 </release>
1315 </grit> 1335 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/default_200_percent/cros/file_types/word_white.png ('k') | chrome/browser/icon_loader_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698