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

Unified Diff: sync/protocol/proto_value_conversions.cc

Issue 12286007: Revert "Revert 182527" ([Sync] Make SESSIONS an implicit type) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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/internal_api/public/base/model_type.h ('k') | sync/protocol/proto_value_conversions_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/protocol/proto_value_conversions.cc
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc
index 3964578d9edcc9d7c47881a292acbb19425f0f8d..bc5b0aedc2504ea76101efae6e78899fb50cf32d 100644
--- a/sync/protocol/proto_value_conversions.cc
+++ b/sync/protocol/proto_value_conversions.cc
@@ -620,6 +620,7 @@ base::DictionaryValue* GetUpdatesMessageToValue(
SET_INT32(batch_size);
SET_REP(from_progress_marker, DataTypeProgressMarkerToValue);
SET_BOOL(streaming);
+ SET_BOOL(need_encryption_key);
SET_BOOL(create_mobile_bookmarks_folder);
return value;
}
@@ -777,6 +778,7 @@ base::DictionaryValue* ClientConfigParamsToValue(
const sync_pb::ClientConfigParams& proto) {
base::DictionaryValue* value = new base::DictionaryValue();
SET_INT32_REP(enabled_type_ids);
+ SET_BOOL(tabs_datatype_enabled);
return value;
}
« no previous file with comments | « sync/internal_api/public/base/model_type.h ('k') | sync/protocol/proto_value_conversions_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698