summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakuegel@chromium.org <akuegel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-26 05:17:18 +0000
committerakuegel@chromium.org <akuegel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-26 05:17:18 +0000
commit7fff975ca69d1c0219254fa3f94a5d18b5496c5e (patch)
treefe971f6397ba11f424f75389cc83182760703b5f
parentb7b780d10b16373ca8d1ded18404dacf7dac2fea (diff)
downloadchromium_src-7fff975ca69d1c0219254fa3f94a5d18b5496c5e.zip
chromium_src-7fff975ca69d1c0219254fa3f94a5d18b5496c5e.tar.gz
chromium_src-7fff975ca69d1c0219254fa3f94a5d18b5496c5e.tar.bz2
Store signature key and encryption key in case syncing hasn't started.
When a supervised user is created, it can happen that the syncing hasn't started already, so we need to store the keys locally such that they will be merged with managed user data when starting sync. BUG=244472 Review URL: https://codereview.chromium.org/177813003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253359 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/managed_mode/managed_user_sync_service.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/managed_mode/managed_user_sync_service.cc b/chrome/browser/managed_mode/managed_user_sync_service.cc
index 94c1027..a29d433 100644
--- a/chrome/browser/managed_mode/managed_user_sync_service.cc
+++ b/chrome/browser/managed_mode/managed_user_sync_service.cc
@@ -209,6 +209,10 @@ void ManagedUserSyncService::AddManagedUser(const std::string& id,
base::DictionaryValue* value = new base::DictionaryValue;
value->SetString(kName, name);
value->SetString(kMasterKey, master_key);
+ value->SetString(kPasswordSignatureKey, signature_key);
+ value->SetString(kPasswordEncryptionKey, encryption_key);
+ // TODO(akuegel): Get rid of the avatar stuff here when Chrome OS switches to
+ // the avatar index that is stored as a shared setting.
std::string chrome_avatar;
std::string chromeos_avatar;
#if defined(OS_CHROMEOS)