summaryrefslogtreecommitdiffstats
path: root/sync/protocol
diff options
context:
space:
mode:
authorvasilii <vasilii@chromium.org>2014-09-05 03:13:42 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-05 10:15:44 +0000
commitdd57b1ab79066e73ff4624c61f594365d63656eb (patch)
tree7c0eaa3f29eca84d55889079e7a90cb12ccf189f /sync/protocol
parent0d5ff64cb103502b151bad7fa8e6087cfab19915 (diff)
downloadchromium_src-dd57b1ab79066e73ff4624c61f594365d63656eb.zip
chromium_src-dd57b1ab79066e73ff4624c61f594365d63656eb.tar.gz
chromium_src-dd57b1ab79066e73ff4624c61f594365d63656eb.tar.bz2
Sync new PasswordForm fields.
They are |display_name|, |avatar_url| and |federation_url|. BUG=400674 TBR=isherman@chromium.org Review URL: https://codereview.chromium.org/520583003 Cr-Commit-Position: refs/heads/master@{#293489}
Diffstat (limited to 'sync/protocol')
-rw-r--r--sync/protocol/password_specifics.proto3
-rw-r--r--sync/protocol/proto_value_conversions.cc3
2 files changed, 6 insertions, 0 deletions
diff --git a/sync/protocol/password_specifics.proto b/sync/protocol/password_specifics.proto
index 218bad4..1baf39d 100644
--- a/sync/protocol/password_specifics.proto
+++ b/sync/protocol/password_specifics.proto
@@ -34,6 +34,9 @@ message PasswordSpecificsData {
optional bool blacklisted = 12;
optional int32 type = 13;
optional int32 times_used = 14;
+ optional string display_name = 15;
+ optional string avatar_url = 16;
+ optional string federation_url = 17;
}
// Properties of password sync objects.
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc
index 62b611f..bb37081 100644
--- a/sync/protocol/proto_value_conversions.cc
+++ b/sync/protocol/proto_value_conversions.cc
@@ -243,6 +243,9 @@ base::DictionaryValue* PasswordSpecificsDataToValue(
SET_BOOL(blacklisted);
SET_INT32(type);
SET_INT32(times_used);
+ SET_STR(display_name);
+ SET_STR(avatar_url);
+ SET_STR(federation_url);
return value;
}