diff options
| author | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-20 22:19:17 +0000 |
|---|---|---|
| committer | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-20 22:19:17 +0000 |
| commit | eeed85c4662942e0c9e557d36fa0d26a938058e5 (patch) | |
| tree | 3e6e267779cd0de15b1dfb8543e399023a4b1342 /webkit/fileapi/file_system_path_manager.cc | |
| parent | fe2534f1d0294dadd3bc915982ef378906a2be57 (diff) | |
| download | chromium_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/file_system_path_manager.cc')
| -rw-r--r-- | webkit/fileapi/file_system_path_manager.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/fileapi/file_system_path_manager.cc b/webkit/fileapi/file_system_path_manager.cc index cefdab8..898a5fa 100644 --- a/webkit/fileapi/file_system_path_manager.cc +++ b/webkit/fileapi/file_system_path_manager.cc @@ -54,19 +54,19 @@ FileSystemPathManager::FileSystemPathManager( FileSystemPathManager::~FileSystemPathManager() {} -void FileSystemPathManager::GetFileSystemRootPath( +void FileSystemPathManager::ValidateFileSystemRootAndGetURL( const GURL& origin_url, fileapi::FileSystemType type, bool create, GetRootPathCallback* callback_ptr) { switch (type) { case kFileSystemTypeTemporary: case kFileSystemTypePersistent: - sandbox_provider_->GetFileSystemRootPath( + sandbox_provider_->ValidateFileSystemRootAndGetURL( origin_url, type, create, callback_ptr); break; case kFileSystemTypeExternal: if (external_provider_.get()) { - external_provider_->GetFileSystemRootPath( + external_provider_->ValidateFileSystemRootAndGetURL( origin_url, type, create, callback_ptr); } else { callback_ptr->Run(false, FilePath(), std::string()); @@ -79,18 +79,18 @@ void FileSystemPathManager::GetFileSystemRootPath( } } -FilePath FileSystemPathManager::GetFileSystemRootPathOnFileThread( +FilePath FileSystemPathManager::ValidateFileSystemRootAndGetPathOnFileThread( const GURL& origin_url, FileSystemType type, const FilePath& virtual_path, bool create) { switch (type) { case kFileSystemTypeTemporary: case kFileSystemTypePersistent: - return sandbox_provider_->GetFileSystemRootPathOnFileThread( + return sandbox_provider_->ValidateFileSystemRootAndGetPathOnFileThread( origin_url, type, virtual_path, create); break; case kFileSystemTypeExternal: return external_provider_.get() ? - external_provider_->GetFileSystemRootPathOnFileThread( + external_provider_->ValidateFileSystemRootAndGetPathOnFileThread( origin_url, type, virtual_path, create) : FilePath(); case kFileSystemTypeUnknown: |