diff options
| author | ibraaaa@chromium.org <ibraaaa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-09 13:51:08 +0000 |
|---|---|---|
| committer | ibraaaa@chromium.org <ibraaaa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-09 13:51:08 +0000 |
| commit | b6c626e5f71570411371c419975891bc6b2338df (patch) | |
| tree | ae1b4851b44406d0e6636fae634569ce7cce1d35 /sync | |
| parent | 63bcb55f7f380f08b9e5e9a6099d6b5d73c5bdcf (diff) | |
| download | chromium_src-b6c626e5f71570411371c419975891bc6b2338df.zip chromium_src-b6c626e5f71570411371c419975891bc6b2338df.tar.gz chromium_src-b6c626e5f71570411371c419975891bc6b2338df.tar.bz2 | |
Avatar syncing for supervised users
Syncs the avatar of the supervised user selected during its creation process but doesn't sync any further changes.
TBR=nkostylev@chromium.org
BUG=278083
Review URL: https://chromiumcodereview.appspot.com/23653007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/protocol/managed_user_specifics.proto | 8 | ||||
| -rw-r--r-- | sync/protocol/proto_value_conversions.cc | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sync/protocol/managed_user_specifics.proto b/sync/protocol/managed_user_specifics.proto index 2a6f1b3..6c81908 100644 --- a/sync/protocol/managed_user_specifics.proto +++ b/sync/protocol/managed_user_specifics.proto @@ -25,4 +25,12 @@ message ManagedUserSpecifics { optional bool acknowledged = 3 [default = false]; // Master key for managed user cryptohome. optional string master_key = 4; + // A string representing the index of the supervised user avatar on Chrome. + // It has the following format: + // "chrome-avatar-index:INDEX" where INDEX is an integer. + optional string chrome_avatar = 5; + // A string representing the index of the supervised user avatar on Chrome OS. + // It has the following format: + // "chromeos-avatar-index:INDEX" where INDEX is an integer. + optional string chromeos_avatar = 6; } diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc index a42b902..a7da289 100644 --- a/sync/protocol/proto_value_conversions.cc +++ b/sync/protocol/proto_value_conversions.cc @@ -492,6 +492,8 @@ base::DictionaryValue* ManagedUserSpecificsToValue( SET_STR(name); SET_BOOL(acknowledged); SET_STR(master_key); + SET_STR(chrome_avatar); + SET_STR(chromeos_avatar); return value; } |