Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Unified Diff: chrome/browser/ui/android/autofill/autofill_dialog_result.cc

Issue 151383003: Updates to wallet for i18n (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: retry upload Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/android/autofill/autofill_dialog_result.cc
diff --git a/chrome/browser/ui/android/autofill/autofill_dialog_result.cc b/chrome/browser/ui/android/autofill/autofill_dialog_result.cc
index 7c223a1df940ed175f1152c18d5dc96017cc15a2..818eed60032a2b3eaa9c9dedf5b0e137ce46da02 100644
--- a/chrome/browser/ui/android/autofill/autofill_dialog_result.cc
+++ b/chrome/browser/ui/android/autofill/autofill_dialog_result.cc
@@ -45,10 +45,11 @@ scoped_ptr<wallet::Address> ParseJavaWalletAddress(
const base::string16 recipient_name =
FETCH_JSTRING(UTF16, env, address, ResultAddress, Name);
- const base::string16 address_line_1 =
- FETCH_JSTRING(UTF16, env, address, ResultAddress, Address1);
- const base::string16 address_line_2 =
- FETCH_JSTRING(UTF16, env, address, ResultAddress, Address2);
+ std::vector<base::string16> address_lines;
+ address_lines.push_back(
+ FETCH_JSTRING(UTF16, env, address, ResultAddress, Address1));
+ address_lines.push_back(
+ FETCH_JSTRING(UTF16, env, address, ResultAddress, Address2));
const base::string16 locality_name =
FETCH_JSTRING(UTF16, env, address, ResultAddress, City);
const base::string16 administrative_area_name =
@@ -61,14 +62,19 @@ scoped_ptr<wallet::Address> ParseJavaWalletAddress(
FETCH_JSTRING(UTF8, env, address, ResultAddress, CountryCode);
DCHECK(!country_name_code.empty());
+ // TODO(aruslan): get these from the JavaWalletAddress.
+ const base::string16 dependent_locality_name;
+ const base::string16 sorting_code;
+
return scoped_ptr<wallet::Address>(new wallet::Address(
country_name_code,
recipient_name,
- address_line_1,
- address_line_2,
+ address_lines,
locality_name,
+ dependent_locality_name,
administrative_area_name,
postal_code_number,
+ sorting_code,
phone_number,
std::string()));
}
« no previous file with comments | « no previous file | chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698