diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 19:07:13 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 19:07:13 +0000 |
| commit | adfc54690d913542f0cdf0f4ea1339ba1670df24 (patch) | |
| tree | 4f20cda44225f5384193bba9933e3676bff6047c /chrome/browser/sync/util | |
| parent | 02896a8fd669ced03e8a76edfbb423c858eafc53 (diff) | |
| download | chromium_src-adfc54690d913542f0cdf0f4ea1339ba1670df24.zip chromium_src-adfc54690d913542f0cdf0f4ea1339ba1670df24.tar.gz chromium_src-adfc54690d913542f0cdf0f4ea1339ba1670df24.tar.bz2 | |
Enable sync for the settings from the Extension Settings API.
Original patch by kalman@chromium.org.
BUG=94575
TEST=unit tests included
TBR=kalman@chromium.org
Review URL: http://codereview.chromium.org/7977018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/util')
| -rw-r--r-- | chrome/browser/sync/util/cryptographer.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/sync/util/cryptographer.cc b/chrome/browser/sync/util/cryptographer.cc index 8126f48..5e2a129 100644 --- a/chrome/browser/sync/util/cryptographer.cc +++ b/chrome/browser/sync/util/cryptographer.cc @@ -291,6 +291,8 @@ void Cryptographer::UpdateEncryptedTypesFromNigori( encrypted_types_.insert(syncable::THEMES); if (nigori.encrypt_typed_urls()) encrypted_types_.insert(syncable::TYPED_URLS); + if (nigori.encrypt_extension_settings()) + encrypted_types_.insert(syncable::EXTENSION_SETTINGS); if (nigori.encrypt_extensions()) encrypted_types_.insert(syncable::EXTENSIONS); if (nigori.encrypt_search_engines()) @@ -324,6 +326,8 @@ void Cryptographer::UpdateNigoriFromEncryptedTypes( nigori->set_encrypt_themes(encrypted_types_.count(syncable::THEMES) > 0); nigori->set_encrypt_typed_urls( encrypted_types_.count(syncable::TYPED_URLS) > 0); + nigori->set_encrypt_extension_settings( + encrypted_types_.count(syncable::EXTENSION_SETTINGS) > 0); nigori->set_encrypt_extensions( encrypted_types_.count(syncable::EXTENSIONS) > 0); nigori->set_encrypt_search_engines( |