diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 10:25:53 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 10:25:53 +0000 |
| commit | 6c462517ce781f27ed0d6c97f50354485702206c (patch) | |
| tree | 801875b7a62761bd2b2817b787cc33df9b706e53 /webkit/fileapi/file_system_path_manager.cc | |
| parent | f69733d14df41c8e10e8f4232da4a5bd477b8348 (diff) | |
| download | chromium_src-6c462517ce781f27ed0d6c97f50354485702206c.zip chromium_src-6c462517ce781f27ed0d6c97f50354485702206c.tar.gz chromium_src-6c462517ce781f27ed0d6c97f50354485702206c.tar.bz2 | |
Revert 67385 - On windows filepaths need \\?\ prefix to allow extended file path names. Fix to bug 63574.
Turned out that we need more changes to make extended paths work.
BUG=63574
TEST=file_system_operation_unittest.cc and manually tested on FAT32.
Review URL: http://codereview.chromium.org/5259003
TBR=kkanetkar@chromium.org
Review URL: http://codereview.chromium.org/5357009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67703 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 | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/webkit/fileapi/file_system_path_manager.cc b/webkit/fileapi/file_system_path_manager.cc index 50f22f9..2bd1f9e 100644 --- a/webkit/fileapi/file_system_path_manager.cc +++ b/webkit/fileapi/file_system_path_manager.cc @@ -124,7 +124,6 @@ class FileSystemPathManager::GetFileSystemRootPathTask DispatchCallbackOnCallerThread(FilePath()); return; } - DispatchCallbackOnCallerThread(root); } @@ -171,25 +170,13 @@ class FileSystemPathManager::GetFileSystemRootPathTask scoped_ptr<FileSystemPathManager::GetRootPathCallback> callback_; }; -FilePath FileSystemPathManager::GetFileSystemCommonRootDirectory( - const FilePath& root_path) { -#if defined(OS_WIN) - // To specify an extended-length path, "\\?\" prefix is used. Else path names - // are limited to 260 characters. - FilePath::StringType extended_length_str(L"\\\\?\\"); - extended_length_str.append(root_path.value()); - return FilePath(extended_length_str).Append(kFileSystemDirectory); -#endif - return root_path.Append(kFileSystemDirectory); -} - FileSystemPathManager::FileSystemPathManager( scoped_refptr<base::MessageLoopProxy> file_message_loop, const FilePath& profile_path, bool is_incognito, bool allow_file_access_from_files) : file_message_loop_(file_message_loop), - base_path_(GetFileSystemCommonRootDirectory(profile_path)), + base_path_(profile_path.Append(kFileSystemDirectory)), is_incognito_(is_incognito), allow_file_access_from_files_(allow_file_access_from_files) { } @@ -228,8 +215,7 @@ void FileSystemPathManager::GetFileSystemRootPath( DCHECK(!type_string.empty()); FilePath origin_base_path = base_path_.AppendASCII(storage_identifier) - .AppendASCII(type_string); - + .AppendASCII(type_string); std::string name = storage_identifier + ":" + type_string; scoped_refptr<GetFileSystemRootPathTask> task( |