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

Unified Diff: chrome/browser/sync/util/cryptographer.cc

Issue 8564032: [Sync] The cryptographer should be able to handle empty or old nigori nodes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile Created 9 years, 1 month 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 | « no previous file | chrome/browser/sync/util/cryptographer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/util/cryptographer.cc
diff --git a/chrome/browser/sync/util/cryptographer.cc b/chrome/browser/sync/util/cryptographer.cc
index f7ac50e334f10a1360b740cde4bfcdb7a463c0ab..4990d8b9f275f353de6ba7ef9e92263eada4ea19 100644
--- a/chrome/browser/sync/util/cryptographer.cc
+++ b/chrome/browser/sync/util/cryptographer.cc
@@ -386,7 +386,7 @@ void Cryptographer::SetEncryptedTypes(
if (encrypted_types_ == encrypted_types) {
akalin 2011/11/17 03:09:20 should be: if (std::includes(encrypted_types_.beg
Nicolas Zea 2011/11/17 05:10:00 Done.
return;
}
- encrypted_types_ = encrypted_types;
+ encrypted_types_.insert(encrypted_types.begin(), encrypted_types.end());
EmitEncryptedTypesChangedNotification();
}
« no previous file with comments | « no previous file | chrome/browser/sync/util/cryptographer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698