diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 13:51:21 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 13:51:21 +0000 |
| commit | d9ba0db85ae085b759d0cf6eaf7182e74d2f8663 (patch) | |
| tree | dfda400c9b0fa8d4b648d19ab1db9428b59bb686 /sync/protocol | |
| parent | 48e4ce36faebbaf6f19c18f1d73eea024b31d038 (diff) | |
| download | chromium_src-d9ba0db85ae085b759d0cf6eaf7182e74d2f8663.zip chromium_src-d9ba0db85ae085b759d0cf6eaf7182e74d2f8663.tar.gz chromium_src-d9ba0db85ae085b759d0cf6eaf7182e74d2f8663.tar.bz2 | |
Add managed user master key to ManagedUserSpecificsToValue().
BUG=TBD
Review URL: https://chromiumcodereview.appspot.com/22339017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/protocol')
| -rw-r--r-- | sync/protocol/proto_value_conversions.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc index 21db7b2..4431357 100644 --- a/sync/protocol/proto_value_conversions.cc +++ b/sync/protocol/proto_value_conversions.cc @@ -462,6 +462,7 @@ base::DictionaryValue* ManagedUserSpecificsToValue( SET_STR(id); SET_STR(name); SET_BOOL(acknowledged); + SET_STR(master_key); return value; } |