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

Unified Diff: components/sync/engine_impl/model_type_worker.cc

Issue 2258873003: [Sync] Move sessions/ to engine/cycle/ and rename things to match. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 4 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
Index: components/sync/engine_impl/model_type_worker.cc
diff --git a/components/sync/engine_impl/model_type_worker.cc b/components/sync/engine_impl/model_type_worker.cc
index dc238bb9db3e3f3005679c3301427818bcf880eb..e1692704c55b2c330a916066b87a1a8c559e3e55 100644
--- a/components/sync/engine_impl/model_type_worker.cc
+++ b/components/sync/engine_impl/model_type_worker.cc
@@ -105,7 +105,7 @@ SyncerError ModelTypeWorker::ProcessGetUpdatesResponse(
const sync_pb::DataTypeProgressMarker& progress_marker,
const sync_pb::DataTypeContext& mutated_context,
const SyncEntityList& applicable_updates,
- syncer::sessions::StatusController* status) {
+ syncer::StatusController* status) {
DCHECK(CalledOnValidThread());
// TODO(rlarocque): Handle data type context conflicts.
@@ -169,7 +169,7 @@ SyncerError ModelTypeWorker::ProcessGetUpdatesResponse(
return syncer::SYNCER_OK;
}
-void ModelTypeWorker::ApplyUpdates(syncer::sessions::StatusController* status) {
+void ModelTypeWorker::ApplyUpdates(syncer::StatusController* status) {
DCHECK(CalledOnValidThread());
// This should only ever be called after one PassiveApplyUpdates.
DCHECK(data_type_state_.initial_sync_done());
@@ -177,8 +177,7 @@ void ModelTypeWorker::ApplyUpdates(syncer::sessions::StatusController* status) {
ApplyPendingUpdates();
}
-void ModelTypeWorker::PassiveApplyUpdates(
- syncer::sessions::StatusController* status) {
+void ModelTypeWorker::PassiveApplyUpdates(syncer::StatusController* status) {
// This should only be called at the end of the very first download cycle.
DCHECK(!data_type_state_.initial_sync_done());
// Indicate to the processor that the initial download is done. The initial
« no previous file with comments | « components/sync/engine_impl/model_type_worker.h ('k') | components/sync/engine_impl/model_type_worker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698