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

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_engine.cc

Issue 109013003: [SyncFS] Fix unknown origin handling in SyncEngine (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/drive_backend/sync_engine.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
index 81bb8ab0270c714ac35e63246d127c966d27fa04..e12282da0c6ad13476baa6910c826063a575edc6 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
@@ -515,6 +515,11 @@ void SyncEngine::DidApplyLocalChange(LocalToRemoteSyncer* syncer,
SYNC_DIRECTION_LOCAL_TO_REMOTE));
}
+ if (status == SYNC_STATUS_UNKNOWN_ORIGIN && syncer->url().is_valid()) {
+ RegisterOrigin(syncer->url().origin(),
+ base::Bind(&EmptyStatusCallback));
+ }
+
if (status != SYNC_STATUS_OK &&
status != SYNC_STATUS_NO_CHANGE_TO_SYNC) {
callback.Run(status);
@@ -527,11 +532,6 @@ void SyncEngine::DidApplyLocalChange(LocalToRemoteSyncer* syncer,
if (status == SYNC_STATUS_OK)
should_check_conflict_ = true;
- if (status == SYNC_STATUS_UNKNOWN_ORIGIN && syncer->url().is_valid()) {
- RegisterOrigin(syncer->url().origin(),
- base::Bind(&EmptyStatusCallback));
- }
-
callback.Run(status);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698