summaryrefslogtreecommitdiffstats
path: root/webkit/fileapi/local_file_system_operation.cc
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 14:55:37 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 14:55:37 +0000
commit9fb9294aab92e35d9584df40d853be5e7ca25ea0 (patch)
treedcb89bceb4352859ca54fe7995a1c1d66190369c /webkit/fileapi/local_file_system_operation.cc
parent262a1f2968e0cb860f4eec37fa07cd51aba48fba (diff)
downloadchromium_src-9fb9294aab92e35d9584df40d853be5e7ca25ea0.zip
chromium_src-9fb9294aab92e35d9584df40d853be5e7ca25ea0.tar.gz
chromium_src-9fb9294aab92e35d9584df40d853be5e7ca25ea0.tar.bz2
Integrate external mount points to IsolatedContext
* To support MTP/Media filesystems in CrOS's FileBrowser * To eventually support external, persistent mount points in sans-CrOS chrome (currently ifdef'ed only for cros since we need http://crbug.com/142289 to do the same in chrome) * To introduce more finer-grained filesystem types * To reduce duplicated code What this patch actually does: - Add external mount point support in IsolatedContext - Introduce new filesystem types, NativeLocal and GData, to represent file systems supported by CrOS - Replace CrOSMountPointProvider's internal mount map with IsolatedContext BUG=139223 TEST=manually tested TEST=existing tests Review URL: https://chromiumcodereview.appspot.com/10823273 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/local_file_system_operation.cc')
-rw-r--r--webkit/fileapi/local_file_system_operation.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/fileapi/local_file_system_operation.cc b/webkit/fileapi/local_file_system_operation.cc
index 2f5a5e7..a0f73b8 100644
--- a/webkit/fileapi/local_file_system_operation.cc
+++ b/webkit/fileapi/local_file_system_operation.cc
@@ -722,7 +722,8 @@ base::PlatformFileError LocalFileSystemOperation::SetUp(
return base::PLATFORM_FILE_ERROR_INVALID_URL;
if (!file_system_context()->GetMountPointProvider(
- url.type())->IsAccessAllowed(url.origin(), url.type(), url.path()))
+ url.type())->IsAccessAllowed(url.origin(), url.type(),
+ url.virtual_path()))
return base::PLATFORM_FILE_ERROR_SECURITY;
DCHECK(file_util);