diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 01:15:03 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 01:15:03 +0000 |
| commit | 928ae885a40ca60611d37305a261549c481cdc4b (patch) | |
| tree | 32925e29b3b3845765068d084ba862e158c40550 /chrome/browser/resources/component_extension_resources.grd | |
| parent | 8c254534e038444e02d9bfb851342bcdf88a48d2 (diff) | |
| download | chromium_src-928ae885a40ca60611d37305a261549c481cdc4b.zip chromium_src-928ae885a40ca60611d37305a261549c481cdc4b.tar.gz chromium_src-928ae885a40ca60611d37305a261549c481cdc4b.tar.bz2 | |
Merged already reviewed CLs for r/o zip support in ChromeOS file browser:
Re-landing http://codereview.chromium.org/7457001:
Adding support for mount point different from removable
devices to MountLibrary
(work in progress..have to add GetMountPoints support)
tested on ChromeOS with these three patches:
http://gerrit.chromium.org/gerrit/#change,4447
http://gerrit.chromium.org/gerrit/#change,4449
http://gerrit.chromium.org/gerrit/#change,4544
http://codereview.chromium.org/7471039/:
UI for mounting/unmounting archive files.
BUG=chromium-os:17673, chromium-os:17783
TEST=Made sure mounting devices still works and that MountCompleted event gets through to file_browser_event_router (checking ui and chrome logs for mount completed entries)
TBR=tbarzic, dgozman
Review URL: http://codereview.chromium.org/7488044
Review URL: http://codereview.chromium.org/7502010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/component_extension_resources.grd')
| -rw-r--r-- | chrome/browser/resources/component_extension_resources.grd | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd index a653fb0..8e312c7 100644 --- a/chrome/browser/resources/component_extension_resources.grd +++ b/chrome/browser/resources/component_extension_resources.grd @@ -39,6 +39,8 @@ <include name="IDR_FILE_MANAGER_PREVIEW_ICON" file="file_manager/images/icon_preview_16x16.png" type="BINDATA" /> <include name="IDR_FILE_MANAGER_MEDIA_PLAY_ICON" file="file_manager/images/icon_play_16x16.png" type="BINDATA" /> <include name="IDR_FILE_MANAGER_MEDIA_ENQUEUE_ICON" file="file_manager/images/icon_add_to_queue_16x16.png" type="BINDATA" /> + <include name="IDR_FILE_MANAGER_ARCHIVE_MOUNT_ICON" file="file_manager/images/icon_mount_archive_16x16.png" type="BINDATA" /> + <include name="IDR_FILE_MANAGER_ARCHIVE_UNMOUNT_ICON" file="file_manager/images/icon_unmount_archive_16x16.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_DOC" file="file_manager/images/filetype_doc.png" type="BINDATA" /> |