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 /webkit/chromeos | |
| 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 'webkit/chromeos')
| -rw-r--r-- | webkit/chromeos/fileapi/cros_mount_point_provider.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/chromeos/fileapi/cros_mount_point_provider.cc index 38a68d0..63c9829 100644 --- a/webkit/chromeos/fileapi/cros_mount_point_provider.cc +++ b/webkit/chromeos/fileapi/cros_mount_point_provider.cc @@ -34,7 +34,8 @@ const char kChromeUIScheme[] = "chrome"; // Top level file system elements exposed in FileAPI in ChromeOS: FixedExposedPaths fixed_exposed_paths[] = { {"/home/chronos/user/", "Downloads"}, - {"/", "media"}, + {"/media", "archive"}, + {"/media", "removable"}, }; CrosMountPointProvider::CrosMountPointProvider( |