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

Unified Diff: chrome/browser/chromeos/file_manager/fileapi_util.cc

Issue 296693003: Don't treat |is_directory| mismatch as an error in entry conversion in files.app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix Created 6 years, 7 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
« no previous file with comments | « chrome/browser/chromeos/file_manager/fileapi_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_manager/fileapi_util.cc
diff --git a/chrome/browser/chromeos/file_manager/fileapi_util.cc b/chrome/browser/chromeos/file_manager/fileapi_util.cc
index b02154b0064dca80b7d6bb60f6348213abaf8a28..0286b5802ebc7f520ffba23627524392077d4e8c 100644
--- a/chrome/browser/chromeos/file_manager/fileapi_util.cc
+++ b/chrome/browser/chromeos/file_manager/fileapi_util.cc
@@ -165,28 +165,20 @@ void FileDefinitionListConverter::OnResolvedURL(
return;
}
- // Check the entry type.
- if (iterator->is_directory &&
- type == fileapi::FileSystemContext::RESOLVED_ENTRY_FILE) {
- OnIteratorConverted(self_deleter.Pass(),
- iterator,
- CreateEntryDefinitionWithError(
- base::File::FILE_ERROR_NOT_A_DIRECTORY));
- return;
- }
- if (!iterator->is_directory &&
- type == fileapi::FileSystemContext::RESOLVED_ENTRY_DIRECTORY) {
- OnIteratorConverted(self_deleter.Pass(),
- iterator,
- CreateEntryDefinitionWithError(
- base::File::FILE_ERROR_NOT_A_FILE));
- return;
- }
-
EntryDefinition entry_definition;
entry_definition.file_system_root_url = info.root_url.spec();
entry_definition.file_system_name = info.name;
- entry_definition.is_directory = iterator->is_directory;
+ switch (type) {
+ case fileapi::FileSystemContext::RESOLVED_ENTRY_FILE:
+ entry_definition.is_directory = false;
+ break;
+ case fileapi::FileSystemContext::RESOLVED_ENTRY_DIRECTORY:
+ entry_definition.is_directory = true;
+ break;
+ case fileapi::FileSystemContext::RESOLVED_ENTRY_NOT_FOUND:
+ entry_definition.is_directory = iterator->is_directory;
+ break;
+ }
entry_definition.error = base::File::FILE_OK;
// Construct a target Entry.fullPath value from the virtual path and the
« no previous file with comments | « chrome/browser/chromeos/file_manager/fileapi_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698