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

Unified Diff: chrome/browser/chromeos/drive/sync/entry_revert_performer.cc

Issue 148283003: drive: Make sync performers aware of locally created files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | « no previous file | chrome/browser/chromeos/drive/sync/remove_performer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/sync/entry_revert_performer.cc
diff --git a/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc b/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc
index ae6bf9f4d4efddc2939d2672b495e8d8c3521924..853039ee9de9f44149d366fe1219b34efcc4893b 100644
--- a/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc
+++ b/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc
@@ -110,6 +110,9 @@ void EntryRevertPerformer::RevertEntryAfterPrepare(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
+ if (error == FILE_ERROR_OK && entry->resource_id().empty())
+ error = FILE_ERROR_INVALID_OPERATION;
+
if (error != FILE_ERROR_OK) {
callback.Run(error);
return;
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/sync/remove_performer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698