Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Unified Diff: webkit/fileapi/file_system_path_manager.cc

Issue 5357009: Revert 67385 - On windows filepaths need \\?\ prefix to allow extended file p... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/fileapi/file_system_path_manager.h ('k') | webkit/fileapi/file_system_path_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/file_system_path_manager.cc
===================================================================
--- webkit/fileapi/file_system_path_manager.cc (revision 67702)
+++ webkit/fileapi/file_system_path_manager.cc (working copy)
@@ -124,7 +124,6 @@
DispatchCallbackOnCallerThread(FilePath());
return;
}
-
DispatchCallbackOnCallerThread(root);
}
@@ -171,25 +170,13 @@
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 @@
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(
« no previous file with comments | « webkit/fileapi/file_system_path_manager.h ('k') | webkit/fileapi/file_system_path_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698