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

Unified Diff: chrome/browser/sync/engine/apply_updates_command.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
Index: chrome/browser/sync/engine/apply_updates_command.cc
diff --git a/chrome/browser/sync/engine/apply_updates_command.cc b/chrome/browser/sync/engine/apply_updates_command.cc
index 70ff1434d4beb22608974bd147ece10e02ebb7d1..88ee3c23edb70c84f4ac8fb485f1056fb8c95971 100644
--- a/chrome/browser/sync/engine/apply_updates_command.cc
+++ b/chrome/browser/sync/engine/apply_updates_command.cc
@@ -44,12 +44,13 @@ std::set<ModelSafeGroup> ApplyUpdatesCommand::GetGroupsToChange(
return groups_with_unapplied_updates;
}
-void ApplyUpdatesCommand::ModelChangingExecuteImpl(SyncSession* session) {
+SyncerError ApplyUpdatesCommand::ModelChangingExecuteImpl(
+ SyncSession* session) {
syncable::ScopedDirLookup dir(session->context()->directory_manager(),
session->context()->account_name());
if (!dir.good()) {
LOG(ERROR) << "Scoped dir lookup failed!";
- return;
+ return DIRECTORY_LOOKUP_FAILED;
}
syncable::WriteTransaction trans(FROM_HERE, syncable::SYNCER, dir);
@@ -91,6 +92,8 @@ void ApplyUpdatesCommand::ModelChangingExecuteImpl(SyncSession* session) {
dir->set_initial_sync_ended_for_type(it.Get(), true);
}
}
+
+ return NO_ERROR;
}
} // namespace browser_sync

Powered by Google App Engine
This is Rietveld 408576698