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

Unified Diff: chrome/browser/sync/glue/sync_backend_host.cc

Issue 10780002: Revert "Revert 146262 - Revert "Revert 142517 - [Sync] Refactor sync configuration logic."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Diff off revert Created 8 years, 5 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/sync_backend_host.cc
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 532f18108d64cb136119e51f3f0206295d7dc8c3..5011cc77f813058545e4ca76456de7e259ecede2 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -1162,6 +1162,11 @@ void SyncBackendHost::HandleInitializationCompletedOnFrontendLoop(
return;
}
+ if (sync_prefs_->HasSyncSetupCompleted() &&
+ initialization_state_ < DOWNLOADING_NIGORI) {
+ initialization_state_ = DOWNLOADING_NIGORI;
+ }
+
// Run initialization state machine.
switch (initialization_state_) {
case NOT_INITIALIZED:
« 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