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

Unified Diff: chrome/browser/chromeos/drive/change_list_processor.cc

Issue 68543002: drive: Support offline delete (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move to drive/other and mark as deleted Created 7 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
Index: chrome/browser/chromeos/drive/change_list_processor.cc
diff --git a/chrome/browser/chromeos/drive/change_list_processor.cc b/chrome/browser/chromeos/drive/change_list_processor.cc
index ab4fef67c4539cabaff24dbe513bc44a9308cacf..1829274cba4825efae3df0b05b72d947b59b6a84 100644
--- a/chrome/browser/chromeos/drive/change_list_processor.cc
+++ b/chrome/browser/chromeos/drive/change_list_processor.cc
@@ -321,7 +321,12 @@ FileError ChangeListProcessor::ApplyEntry(const ResourceEntry& entry) {
default:
error = get_existing_entry_result;
}
+ } else if (existing_entry.parent_local_id() == util::kDriveOtherDirLocalId &&
+ existing_entry.deleted()) {
kinaba 2013/11/12 06:21:29 Is it correct that a file inside a deleted directo
hashimoto 2013/11/25 10:13:58 Recursively marking entries as deleted might be bu
+ // This entry was deleted locally, do nothing.
+ error = FILE_ERROR_OK;
} else {
+ // Add or refresh the entry.
const std::string& parent_resource_id =
parent_resource_id_map_[entry.resource_id()];
DCHECK(!parent_resource_id.empty()) << entry.resource_id();

Powered by Google App Engine
This is Rietveld 408576698