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

Side by Side Diff: chrome/browser/autofill/android/personal_data_manager_android.cc

Issue 2039863002: PaymentRequest: Sync up PaymentAddress with the payment request spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/autofill/android/personal_data_manager_android.h" 5 #include "chrome/browser/autofill/android/personal_data_manager_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 suggested_fields.reset(new std::vector<ServerFieldType>); 515 suggested_fields.reset(new std::vector<ServerFieldType>);
516 suggested_fields->push_back(COMPANY_NAME); 516 suggested_fields->push_back(COMPANY_NAME);
517 suggested_fields->push_back(ADDRESS_HOME_LINE1); 517 suggested_fields->push_back(ADDRESS_HOME_LINE1);
518 suggested_fields->push_back(ADDRESS_HOME_LINE2); 518 suggested_fields->push_back(ADDRESS_HOME_LINE2);
519 suggested_fields->push_back(ADDRESS_HOME_DEPENDENT_LOCALITY); 519 suggested_fields->push_back(ADDRESS_HOME_DEPENDENT_LOCALITY);
520 suggested_fields->push_back(ADDRESS_HOME_CITY); 520 suggested_fields->push_back(ADDRESS_HOME_CITY);
521 suggested_fields->push_back(ADDRESS_HOME_STATE); 521 suggested_fields->push_back(ADDRESS_HOME_STATE);
522 suggested_fields->push_back(ADDRESS_HOME_ZIP); 522 suggested_fields->push_back(ADDRESS_HOME_ZIP);
523 suggested_fields->push_back(ADDRESS_HOME_SORTING_CODE); 523 suggested_fields->push_back(ADDRESS_HOME_SORTING_CODE);
524 suggested_fields->push_back(ADDRESS_HOME_COUNTRY); 524 suggested_fields->push_back(ADDRESS_HOME_COUNTRY);
525 suggested_fields->push_back(PHONE_HOME_WHOLE_NUMBER);
525 minimal_fields_shown = suggested_fields->size(); 526 minimal_fields_shown = suggested_fields->size();
526 } 527 }
527 528
528 std::vector<base::string16> labels; 529 std::vector<base::string16> labels;
529 AutofillProfile::CreateInferredLabels( 530 AutofillProfile::CreateInferredLabels(
530 profiles, suggested_fields.get(), NAME_FULL, minimal_fields_shown, 531 profiles, suggested_fields.get(), NAME_FULL, minimal_fields_shown,
531 g_browser_process->GetApplicationLocale(), &labels); 532 g_browser_process->GetApplicationLocale(), &labels);
532 533
533 return base::android::ToJavaArrayOfStrings(env, labels); 534 return base::android::ToJavaArrayOfStrings(env, labels);
534 } 535 }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 base::android::ConvertJavaStringToUTF16(env, jcountry_name))); 578 base::android::ConvertJavaStringToUTF16(env, jcountry_name)));
578 } 579 }
579 580
580 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { 581 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
581 PersonalDataManagerAndroid* personal_data_manager_android = 582 PersonalDataManagerAndroid* personal_data_manager_android =
582 new PersonalDataManagerAndroid(env, obj); 583 new PersonalDataManagerAndroid(env, obj);
583 return reinterpret_cast<intptr_t>(personal_data_manager_android); 584 return reinterpret_cast<intptr_t>(personal_data_manager_android);
584 } 585 }
585 586
586 } // namespace autofill 587 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698