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

Unified Diff: sync/internal_api/public/activation_context.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/engine/model_type_worker_unittest.cc ('k') | sync/internal_api/public/model_type_processor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/public/activation_context.h
diff --git a/sync/internal_api/public/activation_context.h b/sync/internal_api/public/activation_context.h
index 798d851432af9cc9ef20733731b171177086ba48..48d9476beea45d49165f18f3536583af1f741f42 100644
--- a/sync/internal_api/public/activation_context.h
+++ b/sync/internal_api/public/activation_context.h
@@ -11,6 +11,7 @@
#include "sync/base/sync_export.h"
#include "sync/internal_api/public/model_type_processor.h"
#include "sync/internal_api/public/non_blocking_sync_common.h"
+#include "sync/protocol/data_type_state.pb.h"
namespace syncer_v2 {
@@ -21,7 +22,7 @@ struct SYNC_EXPORT ActivationContext {
~ActivationContext();
// Initial DataTypeState at the moment of activation.
- DataTypeState data_type_state;
+ sync_pb::DataTypeState data_type_state;
// Pending updates from the previous session.
// TODO(stanisc): crbug.com/529498: should remove pending updates.
« no previous file with comments | « sync/engine/model_type_worker_unittest.cc ('k') | sync/internal_api/public/model_type_processor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698