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

Unified Diff: chrome/browser/sync/engine/syncer.cc

Issue 9036003: Avoid useless SYNC_CYCLE_CONTINUATION sync cycle (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | « chrome/browser/sync/engine/sync_scheduler.cc ('k') | chrome/browser/sync/engine/syncer_command.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/syncer.cc
diff --git a/chrome/browser/sync/engine/syncer.cc b/chrome/browser/sync/engine/syncer.cc
index f6490c5831233111a556c58f75ee7ad812cce9b7..3948e136f6ea26775375fb6741816cc69e5412e2 100644
--- a/chrome/browser/sync/engine/syncer.cc
+++ b/chrome/browser/sync/engine/syncer.cc
@@ -144,7 +144,8 @@ void Syncer::SyncShare(sessions::SyncSession* session,
}
case DOWNLOAD_UPDATES: {
DownloadUpdatesCommand download_updates;
- download_updates.Execute(session);
+ session->mutable_status_controller()->set_download_updates_result(
+ download_updates.Execute(session));
next_step = PROCESS_CLIENT_COMMAND;
break;
}
@@ -222,14 +223,17 @@ void Syncer::SyncShare(sessions::SyncSession* session,
}
case POST_COMMIT_MESSAGE: {
PostCommitMessageCommand post_commit_command;
- post_commit_command.Execute(session);
+ session->mutable_status_controller()->set_post_commit_result(
+ post_commit_command.Execute(session));
next_step = PROCESS_COMMIT_RESPONSE;
break;
}
case PROCESS_COMMIT_RESPONSE: {
session->mutable_status_controller()->reset_num_conflicting_commits();
ProcessCommitResponseCommand process_response_command;
- process_response_command.Execute(session);
+ session->mutable_status_controller()->
+ set_process_commit_response_result(
+ process_response_command.Execute(session));
next_step = BUILD_AND_PROCESS_CONFLICT_SETS;
break;
}
« no previous file with comments | « chrome/browser/sync/engine/sync_scheduler.cc ('k') | chrome/browser/sync/engine/syncer_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698