summaryrefslogtreecommitdiffstats
path: root/webkit/fileapi/sandbox_mount_point_provider.cc
diff options
context:
space:
mode:
authorkerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-20 22:19:17 +0000
committerkerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-20 22:19:17 +0000
commiteeed85c4662942e0c9e557d36fa0d26a938058e5 (patch)
tree3e6e267779cd0de15b1dfb8543e399023a4b1342 /webkit/fileapi/sandbox_mount_point_provider.cc
parentfe2534f1d0294dadd3bc915982ef378906a2be57 (diff)
downloadchromium_src-eeed85c4662942e0c9e557d36fa0d26a938058e5.zip
chromium_src-eeed85c4662942e0c9e557d36fa0d26a938058e5.tar.gz
chromium_src-eeed85c4662942e0c9e557d36fa0d26a938058e5.tar.bz2
Merge 82266 - Fixed file/directory url resolution for external mount point provider.Per Eric's request, refactored FileSystemDirURLRequestJob and FileSystemURLRequestJob classes to resolve local file system through a new operation.BUG=chromium-os:14225TEST=added new test cases to FileSystemPathManagerTest.*, added FileSystemOperationTest.TestGetLocalFilePathSuccessReview URL: http://codereview.chromium.org/6864040
TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/6882102 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@82372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/sandbox_mount_point_provider.cc')
-rw-r--r--webkit/fileapi/sandbox_mount_point_provider.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/fileapi/sandbox_mount_point_provider.cc b/webkit/fileapi/sandbox_mount_point_provider.cc
index 5e80296..51954ce 100644
--- a/webkit/fileapi/sandbox_mount_point_provider.cc
+++ b/webkit/fileapi/sandbox_mount_point_provider.cc
@@ -220,7 +220,7 @@ std::vector<FilePath> SandboxMountPointProvider::GetRootDirectories() const {
return std::vector<FilePath>();
}
-void SandboxMountPointProvider::GetFileSystemRootPath(
+void SandboxMountPointProvider::ValidateFileSystemRootAndGetURL(
const GURL& origin_url, fileapi::FileSystemType type,
bool create, FileSystemPathManager::GetRootPathCallback* callback_ptr) {
scoped_ptr<FileSystemPathManager::GetRootPathCallback> callback(callback_ptr);
@@ -239,7 +239,8 @@ void SandboxMountPointProvider::GetFileSystemRootPath(
task->Start(origin_url, origin_base_path, create);
};
-FilePath SandboxMountPointProvider::GetFileSystemRootPathOnFileThread(
+FilePath
+SandboxMountPointProvider::ValidateFileSystemRootAndGetPathOnFileThread(
const GURL& origin_url, FileSystemType type, const FilePath& unused,
bool create) {
FilePath origin_base_path;