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

Unified Diff: sync/engine/model_type_worker.h

Issue 1678343002: [Sync] Moving DataTypeState to proto for serialization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update for Pavel and merging with Max's changes. Created 4 years, 10 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 | « sync/api/metadata_change_list.h ('k') | sync/engine/model_type_worker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/model_type_worker.h
diff --git a/sync/engine/model_type_worker.h b/sync/engine/model_type_worker.h
index ee6e3dc9035e1e1e65a79b5d07d0f99bb321a27a..be0430f447144d0d53b3b8d3af3c6ef56e5ac24f 100644
--- a/sync/engine/model_type_worker.h
+++ b/sync/engine/model_type_worker.h
@@ -21,6 +21,7 @@
#include "sync/internal_api/public/base/model_type.h"
#include "sync/internal_api/public/non_blocking_sync_common.h"
#include "sync/internal_api/public/sync_encryption_handler.h"
+#include "sync/protocol/data_type_state.pb.h"
#include "sync/protocol/sync.pb.h"
#include "sync/util/cryptographer.h"
@@ -59,7 +60,7 @@ class SYNC_EXPORT ModelTypeWorker : public syncer::UpdateHandler,
public base::NonThreadSafe {
public:
ModelTypeWorker(syncer::ModelType type,
- const DataTypeState& initial_state,
+ const sync_pb::DataTypeState& initial_state,
const UpdateResponseDataList& saved_pending_updates,
scoped_ptr<syncer::Cryptographer> cryptographer,
syncer::NudgeHandler* nudge_handler,
@@ -139,7 +140,7 @@ class SYNC_EXPORT ModelTypeWorker : public syncer::UpdateHandler,
syncer::ModelType type_;
// State that applies to the entire model type.
- DataTypeState data_type_state_;
+ sync_pb::DataTypeState data_type_state_;
// Pointer to the ModelTypeProcessor associated with this worker.
// This is NULL when no proxy is connected..
« no previous file with comments | « sync/api/metadata_change_list.h ('k') | sync/engine/model_type_worker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698