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

Unified Diff: sync/syncable/nigori_util.cc

Issue 11445002: Sync user's custom spellcheck dictionary (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge master Created 7 years, 11 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/syncable/model_type.cc ('k') | sync/tools/testserver/chromiumsync.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/syncable/nigori_util.cc
diff --git a/sync/syncable/nigori_util.cc b/sync/syncable/nigori_util.cc
index 584adff4c8b0e15fef07ebf55169d71c536b04df..ffa2599d55aa4ce07b66e109feac744c4d6b583a 100644
--- a/sync/syncable/nigori_util.cc
+++ b/sync/syncable/nigori_util.cc
@@ -275,6 +275,7 @@ void UpdateNigoriFromEncryptedTypes(ModelTypeSet encrypted_types,
nigori->set_encrypt_apps(encrypted_types.Has(APPS));
nigori->set_encrypt_app_notifications(
encrypted_types.Has(APP_NOTIFICATIONS));
+ nigori->set_encrypt_dictionary(encrypted_types.Has(DICTIONARY));
}
ModelTypeSet GetEncryptedTypesFromNigori(
@@ -310,6 +311,8 @@ ModelTypeSet GetEncryptedTypesFromNigori(
encrypted_types.Put(APPS);
if (nigori.encrypt_app_notifications())
encrypted_types.Put(APP_NOTIFICATIONS);
+ if (nigori.encrypt_dictionary())
+ encrypted_types.Put(DICTIONARY);
return encrypted_types;
}
« no previous file with comments | « sync/syncable/model_type.cc ('k') | sync/tools/testserver/chromiumsync.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698