summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-24 14:12:43 +0000
committerdgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-24 14:12:43 +0000
commit5970f146cda0eefc2726a2eeb9bd8e16234e0df1 (patch)
tree9e4c917123a4617cfc4af17439318ac8131132a5
parent8f42b4d97cc2cae4910bb4158201861b3ec4a099 (diff)
downloadchromium_src-5970f146cda0eefc2726a2eeb9bd8e16234e0df1.zip
chromium_src-5970f146cda0eefc2726a2eeb9bd8e16234e0df1.tar.gz
chromium_src-5970f146cda0eefc2726a2eeb9bd8e16234e0df1.tar.bz2
[filebrowser] New icons for image/audio/video.
Also added some missing resource defines in grd-file. BUG=chromium-os:28135,chromium-os:28136 TEST=See bug. Review URL: https://chromiumcodereview.appspot.com/9811007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128736 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/component_extension_resources.grd14
-rw-r--r--chrome/browser/resources/file_manager/images/filetype_audio.pngbin317 -> 1143 bytes
-rw-r--r--chrome/browser/resources/file_manager/images/filetype_image.pngbin252 -> 1073 bytes
-rw-r--r--chrome/browser/resources/file_manager/images/filetype_video.pngbin239 -> 1087 bytes
4 files changed, 13 insertions, 1 deletions
diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd
index 66639c9..c01a031 100644
--- a/chrome/browser/resources/component_extension_resources.grd
+++ b/chrome/browser/resources/component_extension_resources.grd
@@ -60,20 +60,31 @@
<include name="IDR_FILE_MANAGER_SORT_DESC_ICON" file="file_manager/images/sort_desc.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_REMOVABLE_24_ICON" file="file_manager/images/usb_source_24x24.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_REMOVABLE_28_ICON" file="file_manager/images/usb_source_28x28.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_GDATA_24_ICON" file="file_manager/images/gdata_24x24.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_GDATA_28_ICON" file="file_manager/images/gdata_28x28.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_IMG_FILETYPE_ARCHIVE" file="file_manager/images/filetype_archive.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO" file="file_manager/images/filetype_audio.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_IMG_FILETYPE_CHART" file="file_manager/images/filetype_chart.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_DEVICE" file="file_manager/images/filetype_device.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_DOC" file="file_manager/images/filetype_doc.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_IMG_FILETYPE_DRAWING" file="file_manager/images/filetype_drawing.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_IMG_FILETYPE_EXCEL" file="file_manager/images/filetype_excel.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_FOLDER" file="file_manager/images/filetype_folder.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_IMG_FILETYPE_FORM" file="file_manager/images/filetype_form.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_GENERIC" file="file_manager/images/filetype_generic.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_HTML" file="file_manager/images/filetype_html.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE" file="file_manager/images/filetype_image.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_PDF" file="file_manager/images/filetype_pdf.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_IMG_FILETYPE_PPT" file="file_manager/images/filetype_ppt.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_PRESENTATION" file="file_manager/images/filetype_presentation.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_IMG_FILETYPE_SCRIPT" file="file_manager/images/filetype_script.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_IMG_FILETYPE_SITES" file="file_manager/images/filetype_sites.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_SPREADSHEET" file="file_manager/images/filetype_spreadsheet.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_UNREADABLE_DEVICE" file="file_manager/images/filetype_unreadable_device.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_TEXT" file="file_manager/images/filetype_text.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_IMG_FILETYPE_UNREADABLE_DEVICE" file="file_manager/images/filetype_unreadable_device.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_VIDEO" file="file_manager/images/filetype_video.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_IMG_FILETYPE_WORD" file="file_manager/images/filetype_word.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_AUDIO" file="file_manager/images/filetype_large_audio.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_FOLDER" file="file_manager/images/filetype_large_folder.png" type="BINDATA" />
@@ -117,6 +128,7 @@
<include name="IDR_FILE_MANAGER_IMG_GALLERY_CURSOR_NWSE" file="file_manager/images/gallery/cursor_nwse.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_GALLERY_CURSOR_SWNE" file="file_manager/images/gallery/cursor_swne.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_GALLERY_SLIDER_THUMB" file="file_manager/images/gallery/slider_thumb.png" type="BINDATA" />
+ <include name="IDR_FILE_MANAGER_IMG_GALLERY_BUTTERBAR_CLOSE_X" file="file_manager/images/gallery/butterbar_close_x.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ICON_LIST_VIEW_ON" file="file_manager/images/icon_list_view_on.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ICON_LIST_VIEW_OFF" file="file_manager/images/icon_list_view_off.png" type="BINDATA" />
diff --git a/chrome/browser/resources/file_manager/images/filetype_audio.png b/chrome/browser/resources/file_manager/images/filetype_audio.png
index 5111b78..b43b6db 100644
--- a/chrome/browser/resources/file_manager/images/filetype_audio.png
+++ b/chrome/browser/resources/file_manager/images/filetype_audio.png
Binary files differ
diff --git a/chrome/browser/resources/file_manager/images/filetype_image.png b/chrome/browser/resources/file_manager/images/filetype_image.png
index d119e18..9375cf6 100644
--- a/chrome/browser/resources/file_manager/images/filetype_image.png
+++ b/chrome/browser/resources/file_manager/images/filetype_image.png
Binary files differ
diff --git a/chrome/browser/resources/file_manager/images/filetype_video.png b/chrome/browser/resources/file_manager/images/filetype_video.png
index 68ad38d..a08a9fd 100644
--- a/chrome/browser/resources/file_manager/images/filetype_video.png
+++ b/chrome/browser/resources/file_manager/images/filetype_video.png
Binary files differ