OLD | NEW |
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 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
556 suggested_fields.reset(new std::vector<ServerFieldType>); | 556 suggested_fields.reset(new std::vector<ServerFieldType>); |
557 suggested_fields->push_back(COMPANY_NAME); | 557 suggested_fields->push_back(COMPANY_NAME); |
558 suggested_fields->push_back(ADDRESS_HOME_LINE1); | 558 suggested_fields->push_back(ADDRESS_HOME_LINE1); |
559 suggested_fields->push_back(ADDRESS_HOME_LINE2); | 559 suggested_fields->push_back(ADDRESS_HOME_LINE2); |
560 suggested_fields->push_back(ADDRESS_HOME_DEPENDENT_LOCALITY); | 560 suggested_fields->push_back(ADDRESS_HOME_DEPENDENT_LOCALITY); |
561 suggested_fields->push_back(ADDRESS_HOME_CITY); | 561 suggested_fields->push_back(ADDRESS_HOME_CITY); |
562 suggested_fields->push_back(ADDRESS_HOME_STATE); | 562 suggested_fields->push_back(ADDRESS_HOME_STATE); |
563 suggested_fields->push_back(ADDRESS_HOME_ZIP); | 563 suggested_fields->push_back(ADDRESS_HOME_ZIP); |
564 suggested_fields->push_back(ADDRESS_HOME_SORTING_CODE); | 564 suggested_fields->push_back(ADDRESS_HOME_SORTING_CODE); |
565 suggested_fields->push_back(ADDRESS_HOME_COUNTRY); | 565 suggested_fields->push_back(ADDRESS_HOME_COUNTRY); |
566 suggested_fields->push_back(PHONE_HOME_WHOLE_NUMBER); | |
567 minimal_fields_shown = suggested_fields->size(); | 566 minimal_fields_shown = suggested_fields->size(); |
568 } | 567 } |
569 | 568 |
570 std::vector<base::string16> labels; | 569 std::vector<base::string16> labels; |
571 AutofillProfile::CreateInferredLabels( | 570 AutofillProfile::CreateInferredLabels( |
572 profiles, suggested_fields.get(), NAME_FULL, minimal_fields_shown, | 571 profiles, suggested_fields.get(), NAME_FULL, minimal_fields_shown, |
573 g_browser_process->GetApplicationLocale(), &labels); | 572 g_browser_process->GetApplicationLocale(), &labels); |
574 | 573 |
575 return base::android::ToJavaArrayOfStrings(env, labels); | 574 return base::android::ToJavaArrayOfStrings(env, labels); |
576 } | 575 } |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
619 base::android::ConvertJavaStringToUTF16(env, jcountry_name))); | 618 base::android::ConvertJavaStringToUTF16(env, jcountry_name))); |
620 } | 619 } |
621 | 620 |
622 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 621 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
623 PersonalDataManagerAndroid* personal_data_manager_android = | 622 PersonalDataManagerAndroid* personal_data_manager_android = |
624 new PersonalDataManagerAndroid(env, obj); | 623 new PersonalDataManagerAndroid(env, obj); |
625 return reinterpret_cast<intptr_t>(personal_data_manager_android); | 624 return reinterpret_cast<intptr_t>(personal_data_manager_android); |
626 } | 625 } |
627 | 626 |
628 } // namespace autofill | 627 } // namespace autofill |
OLD | NEW |