| 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 <memory> |
| 8 | 9 |
| 9 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
| 10 #include "base/android/jni_string.h" | 11 #include "base/android/jni_string.h" |
| 11 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 12 #include "base/format_macros.h" | 13 #include "base/format_macros.h" |
| 13 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
| 14 #include "base/strings/stringprintf.h" | 15 #include "base/strings/stringprintf.h" |
| 15 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
| 16 #include "chrome/browser/android/resource_mapper.h" | 17 #include "chrome/browser/android/resource_mapper.h" |
| 17 #include "chrome/browser/autofill/personal_data_manager_factory.h" | 18 #include "chrome/browser/autofill/personal_data_manager_factory.h" |
| (...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 } else { | 326 } else { |
| 326 profile.set_guid(guid); | 327 profile.set_guid(guid); |
| 327 personal_data_manager_->UpdateProfile(profile); | 328 personal_data_manager_->UpdateProfile(profile); |
| 328 } | 329 } |
| 329 | 330 |
| 330 return ConvertUTF8ToJavaString(env, profile.guid()); | 331 return ConvertUTF8ToJavaString(env, profile.guid()); |
| 331 } | 332 } |
| 332 | 333 |
| 333 ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileLabels( | 334 ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileLabels( |
| 334 JNIEnv* env, | 335 JNIEnv* env, |
| 335 const JavaParamRef<jobject>& unused_obj) { | 336 const JavaParamRef<jobject>& unused_obj, |
| 337 bool address_only) { |
| 338 std::unique_ptr<std::vector<ServerFieldType>> suggested_fields; |
| 339 size_t minimal_fields_shown = 2; |
| 340 if (address_only) { |
| 341 suggested_fields.reset(new std::vector<ServerFieldType>); |
| 342 suggested_fields->push_back(COMPANY_NAME); |
| 343 suggested_fields->push_back(ADDRESS_HOME_LINE1); |
| 344 suggested_fields->push_back(ADDRESS_HOME_LINE2); |
| 345 suggested_fields->push_back(ADDRESS_HOME_DEPENDENT_LOCALITY); |
| 346 suggested_fields->push_back(ADDRESS_HOME_CITY); |
| 347 suggested_fields->push_back(ADDRESS_HOME_STATE); |
| 348 suggested_fields->push_back(ADDRESS_HOME_ZIP); |
| 349 suggested_fields->push_back(ADDRESS_HOME_SORTING_CODE); |
| 350 suggested_fields->push_back(ADDRESS_HOME_COUNTRY); |
| 351 minimal_fields_shown = suggested_fields->size(); |
| 352 } |
| 353 |
| 336 std::vector<base::string16> labels; | 354 std::vector<base::string16> labels; |
| 337 AutofillProfile::CreateInferredLabels( | 355 AutofillProfile::CreateInferredLabels( |
| 338 personal_data_manager_->GetProfiles(), NULL, NAME_FULL, 2, | 356 personal_data_manager_->GetProfiles(), suggested_fields.get(), NAME_FULL, |
| 339 g_browser_process->GetApplicationLocale(), &labels); | 357 minimal_fields_shown, g_browser_process->GetApplicationLocale(), &labels); |
| 340 | 358 |
| 341 return base::android::ToJavaArrayOfStrings(env, labels); | 359 return base::android::ToJavaArrayOfStrings(env, labels); |
| 342 } | 360 } |
| 343 | 361 |
| 344 jint PersonalDataManagerAndroid::GetCreditCardCount( | 362 jint PersonalDataManagerAndroid::GetCreditCardCount( |
| 345 JNIEnv* unused_env, | 363 JNIEnv* unused_env, |
| 346 const JavaParamRef<jobject>& unused_obj) { | 364 const JavaParamRef<jobject>& unused_obj) { |
| 347 return personal_data_manager_->GetCreditCards().size(); | 365 return personal_data_manager_->GetCreditCards().size(); |
| 348 } | 366 } |
| 349 | 367 |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 476 base::android::ConvertJavaStringToUTF16(env, jcountry_name))); | 494 base::android::ConvertJavaStringToUTF16(env, jcountry_name))); |
| 477 } | 495 } |
| 478 | 496 |
| 479 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 497 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 480 PersonalDataManagerAndroid* personal_data_manager_android = | 498 PersonalDataManagerAndroid* personal_data_manager_android = |
| 481 new PersonalDataManagerAndroid(env, obj); | 499 new PersonalDataManagerAndroid(env, obj); |
| 482 return reinterpret_cast<intptr_t>(personal_data_manager_android); | 500 return reinterpret_cast<intptr_t>(personal_data_manager_android); |
| 483 } | 501 } |
| 484 | 502 |
| 485 } // namespace autofill | 503 } // namespace autofill |
| OLD | NEW |