| Index: webkit/chromeos/fileapi/cros_mount_point_provider.cc
|
| diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
|
| index d479300429e24baaebc2716f069d3a3e1f728de9..88f705d98d8dab0827d138c6550cc63d3bbab5fe 100644
|
| --- a/webkit/chromeos/fileapi/cros_mount_point_provider.cc
|
| +++ b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
|
| @@ -79,21 +79,17 @@ bool CrosMountPointProvider::GetRootForVirtualPath(
|
| return true;
|
| }
|
|
|
| -void CrosMountPointProvider::ValidateFileSystemRootAndGetURL(
|
| +void CrosMountPointProvider::ValidateFileSystemRoot(
|
| const GURL& origin_url,
|
| fileapi::FileSystemType type,
|
| bool create,
|
| - const GetRootPathCallback& callback) {
|
| + const ValidateFileSystemCallback& callback) {
|
| + // Nothing to validate for external filesystem.
|
| DCHECK(type == fileapi::kFileSystemTypeExternal);
|
| - std::string name(GetOriginIdentifierFromURL(origin_url));
|
| - name += ':';
|
| - name += fileapi::kExternalName;
|
| - FilePath root_path;
|
| - root_path = FilePath(fileapi::kExternalDir);
|
| - callback.Run(true, root_path, name);
|
| + callback.Run(base::PLATFORM_FILE_OK);
|
| }
|
|
|
| -FilePath CrosMountPointProvider::ValidateFileSystemRootAndGetPathOnFileThread(
|
| +FilePath CrosMountPointProvider::GetFileSystemRootPathOnFileThread(
|
| const GURL& origin_url,
|
| fileapi::FileSystemType type,
|
| const FilePath& virtual_path,
|
| @@ -106,11 +102,6 @@ FilePath CrosMountPointProvider::ValidateFileSystemRootAndGetPathOnFileThread(
|
| return root_path;
|
| }
|
|
|
| -// TODO(zelidrag): Share this code with SandboxMountPointProvider impl.
|
| -bool CrosMountPointProvider::IsRestrictedFileName(const FilePath& path) const {
|
| - return false;
|
| -}
|
| -
|
| bool CrosMountPointProvider::IsAccessAllowed(const GURL& origin_url,
|
| fileapi::FileSystemType type,
|
| const FilePath& virtual_path) {
|
| @@ -130,6 +121,11 @@ bool CrosMountPointProvider::IsAccessAllowed(const GURL& origin_url,
|
| virtual_path);
|
| }
|
|
|
| +// TODO(zelidrag): Share this code with SandboxMountPointProvider impl.
|
| +bool CrosMountPointProvider::IsRestrictedFileName(const FilePath& path) const {
|
| + return false;
|
| +}
|
| +
|
| void CrosMountPointProvider::AddMountPoint(FilePath mount_point) {
|
| base::AutoLock locker(lock_);
|
| mount_point_map_.erase(mount_point.BaseName().value());
|
|
|