summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/public/util/sync_string_conversions.h
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-16 02:34:16 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-16 02:34:16 +0000
commit4cda788849ffa2942fe593d7b1e4ddd2ff8e30d6 (patch)
tree503db151113cb71fc5a26bc0c9f0d4b748f2865b /sync/internal_api/public/util/sync_string_conversions.h
parent10df83e1635617ef38ca9c40bdaf725e00154bb7 (diff)
downloadchromium_src-4cda788849ffa2942fe593d7b1e4ddd2ff8e30d6.zip
chromium_src-4cda788849ffa2942fe593d7b1e4ddd2ff8e30d6.tar.gz
chromium_src-4cda788849ffa2942fe593d7b1e4ddd2ff8e30d6.tar.bz2
[Sync] Add SyncEncryptionHandler
All sync-specific encryption state (types, encrypt everything, explicit passphrase, keys) is now tracked within the new class SyncEncryptionHandler. It's owned by the sync manager, and unifies some of the observer logic we previously had. In addition, it's capable of creating its own transactions, taking us a step closer to have a nigori datatype. In addition, we add a NigoriHandler to abstract the chrome-side of encryption from the sync visible side of encryption. BUG=139848 Review URL: https://chromiumcodereview.appspot.com/10827266 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/public/util/sync_string_conversions.h')
-rw-r--r--sync/internal_api/public/util/sync_string_conversions.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sync/internal_api/public/util/sync_string_conversions.h b/sync/internal_api/public/util/sync_string_conversions.h
index 45286ca..1c55898 100644
--- a/sync/internal_api/public/util/sync_string_conversions.h
+++ b/sync/internal_api/public/util/sync_string_conversions.h
@@ -5,6 +5,7 @@
#ifndef SYNC_INTERNAL_API_PUBLIC_UTIL_SYNC_STRING_CONVERSIONS_H_
#define SYNC_INTERNAL_API_PUBLIC_UTIL_SYNC_STRING_CONVERSIONS_H_
+#include "sync/internal_api/public/sync_encryption_handler.h"
#include "sync/internal_api/public/sync_manager.h"
namespace syncer {