summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-03-11 17:10:37 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-12 00:11:31 +0000
commitdf6c2e7bf259b1e7ed9d5982847f7d5db6a22910 (patch)
tree2f8cb99b8143dfea8e02b22bff1595d6aa9e0710 /sync
parent707a56a6f0e56138fcef5db3ba7ace1ac3cb83eb (diff)
downloadchromium_src-df6c2e7bf259b1e7ed9d5982847f7d5db6a22910.zip
chromium_src-df6c2e7bf259b1e7ed9d5982847f7d5db6a22910.tar.gz
chromium_src-df6c2e7bf259b1e7ed9d5982847f7d5db6a22910.tar.bz2
Add phone number to wallet addresses
This hooks up the wallet profiles to the already-existing sqlite DB phone_number column. Updates the proto conversions to also add recipient_name which was missed when that field was added. Review URL: https://codereview.chromium.org/983993003 Cr-Commit-Position: refs/heads/master@{#320188}
Diffstat (limited to 'sync')
-rw-r--r--sync/protocol/autofill_specifics.proto5
-rw-r--r--sync/protocol/proto_value_conversions.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/sync/protocol/autofill_specifics.proto b/sync/protocol/autofill_specifics.proto
index 5abb158..85a868e 100644
--- a/sync/protocol/autofill_specifics.proto
+++ b/sync/protocol/autofill_specifics.proto
@@ -117,7 +117,7 @@ message WalletMaskedCreditCard {
// on the server that is pulled down rather than synced between Chromes.
message WalletPostalAddress {
// Server-generated unique ID string. This is opaque to the client.
- optional string id = 1;
+ optional string id = 1;
optional string recipient_name = 12;
optional string company_name = 2;
@@ -150,6 +150,9 @@ message WalletPostalAddress {
optional string country_code = 10;
optional string language_code = 11;
+
+ // Phone number. The format is unspecified and will be explicitly ignored.
+ optional string phone_number = 13;
}
message AutofillWalletSpecifics {
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc
index d3f22fa..162062d 100644
--- a/sync/protocol/proto_value_conversions.cc
+++ b/sync/protocol/proto_value_conversions.cc
@@ -700,6 +700,7 @@ base::DictionaryValue* WalletMaskedCreditCardToValue(
base::DictionaryValue* WalletPostalAddressToValue(
const sync_pb::WalletPostalAddress& proto) {
base::DictionaryValue* value = new base::DictionaryValue();
+ SET_STR(recipient_name);
SET_STR(company_name);
SET_STR_REP(street_address);
SET_STR(address_1);
@@ -709,6 +710,7 @@ base::DictionaryValue* WalletPostalAddressToValue(
SET_STR(postal_code);
SET_STR(sorting_code);
SET_STR(country_code);
+ SET_STR(phone_number);
SET_STR(language_code);
return value;
}