diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-27 06:00:59 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-27 06:00:59 +0000 |
| commit | 4c413de038d8d3c29d9bfd6a55495c064a5c22ab (patch) | |
| tree | fe2469bd2f82f6c3d2456c4b5dd38bc4e0d46d24 /webkit/browser | |
| parent | 08332c1cf6b1e776b4632de30c11f579f1635788 (diff) | |
| download | chromium_src-4c413de038d8d3c29d9bfd6a55495c064a5c22ab.zip chromium_src-4c413de038d8d3c29d9bfd6a55495c064a5c22ab.tar.gz chromium_src-4c413de038d8d3c29d9bfd6a55495c064a5c22ab.tar.bz2 | |
Fix dependency: make file_system_util not depend on FileSystemURL
Move fileapi::AreSameFileSystem utility method to FileSystemURL.
BUG=239710
TEST=FileSystemURLTest.IsInSameFileSystem
R=tzik@chromium.org
Review URL: https://codereview.chromium.org/15754005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/browser')
| -rw-r--r-- | webkit/browser/fileapi/cross_operation_delegate.cc | 2 | ||||
| -rw-r--r-- | webkit/browser/fileapi/local_file_system_operation.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/browser/fileapi/cross_operation_delegate.cc b/webkit/browser/fileapi/cross_operation_delegate.cc index 308651f..7c1c7d6 100644 --- a/webkit/browser/fileapi/cross_operation_delegate.cc +++ b/webkit/browser/fileapi/cross_operation_delegate.cc @@ -30,7 +30,7 @@ CrossOperationDelegate::CrossOperationDelegate( operation_type_(operation_type), callback_(callback), src_root_operation_(src_root_operation.Pass()) { - same_file_system_ = AreSameFileSystem(src_root_, dest_root_); + same_file_system_ = src_root_.IsInSameFileSystem(dest_root_); } CrossOperationDelegate::~CrossOperationDelegate() { diff --git a/webkit/browser/fileapi/local_file_system_operation.cc b/webkit/browser/fileapi/local_file_system_operation.cc index 8203e99..4a10db9 100644 --- a/webkit/browser/fileapi/local_file_system_operation.cc +++ b/webkit/browser/fileapi/local_file_system_operation.cc @@ -517,7 +517,7 @@ void LocalFileSystemOperation::CopyFileLocal( const FileSystemURL& dest_url, const StatusCallback& callback) { DCHECK(SetPendingOperationType(kOperationCopy)); - DCHECK(AreSameFileSystem(src_url, dest_url)); + DCHECK(src_url.IsInSameFileSystem(dest_url)); base::PlatformFileError result = SetUp(src_url, OPERATION_MODE_READ); if (result == base::PLATFORM_FILE_OK) @@ -540,7 +540,7 @@ void LocalFileSystemOperation::MoveFileLocal( const FileSystemURL& dest_url, const StatusCallback& callback) { DCHECK(SetPendingOperationType(kOperationMove)); - DCHECK(AreSameFileSystem(src_url, dest_url)); + DCHECK(src_url.IsInSameFileSystem(dest_url)); base::PlatformFileError result = SetUp(src_url, OPERATION_MODE_WRITE); if (result == base::PLATFORM_FILE_OK) |