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

Unified Diff: content/browser/fileapi/fileapi_message_filter.cc

Issue 242443004: Remove thread restriction of fileapi::FileSystemContext::ResolveURL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comment. Created 6 years, 8 months 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
Index: content/browser/fileapi/fileapi_message_filter.cc
diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc
index 9e2372ebc0fc6da97fc4d71ff6f363dd5724e058..b900124c5e39e507fd5805610d8b472e8aa9474f 100644
--- a/content/browser/fileapi/fileapi_message_filter.cc
+++ b/content/browser/fileapi/fileapi_message_filter.cc
@@ -771,16 +771,22 @@ void FileAPIMessageFilter::DidOpenFileSystem(int request_id,
// For OpenFileSystem we do not create a new operation, so no unregister here.
}
-void FileAPIMessageFilter::DidResolveURL(int request_id,
- base::File::Error result,
- const fileapi::FileSystemInfo& info,
- const base::FilePath& file_path,
- bool is_directory) {
+void FileAPIMessageFilter::DidResolveURL(
+ int request_id,
+ base::File::Error result,
+ const fileapi::FileSystemInfo& info,
+ const base::FilePath& file_path,
+ fileapi::FileSystemContext::ResolvedEntryType type) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ if (result == base::File::FILE_OK &&
+ type == fileapi::FileSystemContext::RESOLVED_ENTRY_NOT_FOUND)
+ result = base::File::FILE_ERROR_NOT_FOUND;
+
if (result == base::File::FILE_OK) {
DCHECK(info.root_url.is_valid());
Send(new FileSystemMsg_DidResolveURL(
- request_id, info, file_path, is_directory));
+ request_id, info, file_path,
+ type == fileapi::FileSystemContext::RESOLVED_ENTRY_DIRECTORY));
} else {
Send(new FileSystemMsg_DidFail(request_id, result));
}

Powered by Google App Engine
This is Rietveld 408576698