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

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

Issue 1982623002: [Autofill] Sort profiles and credit cards by frecency in PaymentRequest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unnecessary method 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 <memory> 9 #include <memory>
9 #include <utility> 10 #include <utility>
10 11
11 #include "base/android/jni_array.h" 12 #include "base/android/jni_array.h"
12 #include "base/android/jni_string.h" 13 #include "base/android/jni_string.h"
13 #include "base/command_line.h" 14 #include "base/command_line.h"
14 #include "base/format_macros.h" 15 #include "base/format_macros.h"
15 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
16 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
17 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "base/time/time.h"
18 #include "chrome/browser/android/resource_mapper.h" 20 #include "chrome/browser/android/resource_mapper.h"
19 #include "chrome/browser/autofill/personal_data_manager_factory.h" 21 #include "chrome/browser/autofill/personal_data_manager_factory.h"
20 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/profiles/profile_manager.h" 24 #include "chrome/browser/profiles/profile_manager.h"
23 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
24 #include "components/autofill/content/browser/content_autofill_driver.h" 26 #include "components/autofill/content/browser/content_autofill_driver.h"
25 #include "components/autofill/content/browser/content_autofill_driver_factory.h" 27 #include "components/autofill/content/browser/content_autofill_driver_factory.h"
26 #include "components/autofill/core/browser/autofill_country.h" 28 #include "components/autofill/core/browser/autofill_country.h"
27 #include "components/autofill/core/browser/autofill_type.h" 29 #include "components/autofill/core/browser/autofill_type.h"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 : weak_java_obj_(env, obj), 283 : weak_java_obj_(env, obj),
282 personal_data_manager_(PersonalDataManagerFactory::GetForProfile( 284 personal_data_manager_(PersonalDataManagerFactory::GetForProfile(
283 ProfileManager::GetActiveUserProfile())) { 285 ProfileManager::GetActiveUserProfile())) {
284 personal_data_manager_->AddObserver(this); 286 personal_data_manager_->AddObserver(this);
285 } 287 }
286 288
287 PersonalDataManagerAndroid::~PersonalDataManagerAndroid() { 289 PersonalDataManagerAndroid::~PersonalDataManagerAndroid() {
288 personal_data_manager_->RemoveObserver(this); 290 personal_data_manager_->RemoveObserver(this);
289 } 291 }
290 292
291 jint PersonalDataManagerAndroid::GetProfileCount( 293 ScopedJavaLocalRef<jobjectArray>
292 JNIEnv* unused_env, 294 PersonalDataManagerAndroid::GetProfileGUIDsForSettings(
295 JNIEnv* env,
293 const JavaParamRef<jobject>& unused_obj) { 296 const JavaParamRef<jobject>& unused_obj) {
294 return personal_data_manager_->GetProfiles().size(); 297 return GetProfileGUIDs(env, personal_data_manager_->GetProfiles());
295 } 298 }
296 299
297 ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetProfileByIndex( 300 ScopedJavaLocalRef<jobjectArray>
301 PersonalDataManagerAndroid::GetProfileGUIDsToSuggest(
298 JNIEnv* env, 302 JNIEnv* env,
299 const JavaParamRef<jobject>& unused_obj, 303 const JavaParamRef<jobject>& unused_obj) {
300 jint index) { 304 return GetProfileGUIDs(env, personal_data_manager_->GetProfilesToSuggest());
301 const std::vector<AutofillProfile*>& profiles =
302 personal_data_manager_->GetProfiles();
303 size_t index_size_t = static_cast<size_t>(index);
304 DCHECK_LT(index_size_t, profiles.size());
305 return CreateJavaProfileFromNative(env, *profiles[index_size_t]);
306 } 305 }
307 306
308 ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetProfileByGUID( 307 ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetProfileByGUID(
309 JNIEnv* env, 308 JNIEnv* env,
310 const JavaParamRef<jobject>& unused_obj, 309 const JavaParamRef<jobject>& unused_obj,
311 const JavaParamRef<jstring>& jguid) { 310 const JavaParamRef<jstring>& jguid) {
312 AutofillProfile* profile = personal_data_manager_->GetProfileByGUID( 311 AutofillProfile* profile = personal_data_manager_->GetProfileByGUID(
313 ConvertJavaStringToUTF8(env, jguid)); 312 ConvertJavaStringToUTF8(env, jguid));
314 if (!profile) 313 if (!profile)
315 return ScopedJavaLocalRef<jobject>(); 314 return ScopedJavaLocalRef<jobject>();
(...skipping 15 matching lines...) Expand all
331 if (guid.empty()) { 330 if (guid.empty()) {
332 personal_data_manager_->AddProfile(profile); 331 personal_data_manager_->AddProfile(profile);
333 } else { 332 } else {
334 profile.set_guid(guid); 333 profile.set_guid(guid);
335 personal_data_manager_->UpdateProfile(profile); 334 personal_data_manager_->UpdateProfile(profile);
336 } 335 }
337 336
338 return ConvertUTF8ToJavaString(env, profile.guid()); 337 return ConvertUTF8ToJavaString(env, profile.guid());
339 } 338 }
340 339
341 ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileLabels( 340 ScopedJavaLocalRef<jobjectArray>
341 PersonalDataManagerAndroid::GetProfileLabelsForSettings(
342 JNIEnv* env, 342 JNIEnv* env,
343 const JavaParamRef<jobject>& unused_obj, 343 const JavaParamRef<jobject>& unused_obj,
344 bool address_only) { 344 bool address_only) {
345 std::unique_ptr<std::vector<ServerFieldType>> suggested_fields; 345 return GetProfileLabels(env, address_only,
346 size_t minimal_fields_shown = 2; 346 personal_data_manager_->GetProfiles());
347 if (address_only) {
348 suggested_fields.reset(new std::vector<ServerFieldType>);
349 suggested_fields->push_back(COMPANY_NAME);
350 suggested_fields->push_back(ADDRESS_HOME_LINE1);
351 suggested_fields->push_back(ADDRESS_HOME_LINE2);
352 suggested_fields->push_back(ADDRESS_HOME_DEPENDENT_LOCALITY);
353 suggested_fields->push_back(ADDRESS_HOME_CITY);
354 suggested_fields->push_back(ADDRESS_HOME_STATE);
355 suggested_fields->push_back(ADDRESS_HOME_ZIP);
356 suggested_fields->push_back(ADDRESS_HOME_SORTING_CODE);
357 suggested_fields->push_back(ADDRESS_HOME_COUNTRY);
358 minimal_fields_shown = suggested_fields->size();
359 }
360
361 std::vector<base::string16> labels;
362 AutofillProfile::CreateInferredLabels(
363 personal_data_manager_->GetProfiles(), suggested_fields.get(), NAME_FULL,
364 minimal_fields_shown, g_browser_process->GetApplicationLocale(), &labels);
365
366 return base::android::ToJavaArrayOfStrings(env, labels);
367 } 347 }
368 348
369 jint PersonalDataManagerAndroid::GetCreditCardCount( 349 ScopedJavaLocalRef<jobjectArray>
370 JNIEnv* unused_env, 350 PersonalDataManagerAndroid::GetProfileLabelsToSuggest(
371 const JavaParamRef<jobject>& unused_obj) { 351 JNIEnv* env,
372 return personal_data_manager_->GetCreditCards().size(); 352 const JavaParamRef<jobject>& unused_obj,
353 bool address_only) {
354 return GetProfileLabels(env, address_only,
355 personal_data_manager_->GetProfilesToSuggest());
373 } 356 }
374 357
375 ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetCreditCardByIndex( 358 base::android::ScopedJavaLocalRef<jobjectArray>
359 PersonalDataManagerAndroid::GetCreditCardGUIDsForSettings(
376 JNIEnv* env, 360 JNIEnv* env,
377 const JavaParamRef<jobject>& unused_obj, 361 const base::android::JavaParamRef<jobject>& unused_obj) {
378 jint index) { 362 return GetCreditCardGUIDs(env, personal_data_manager_->GetCreditCards());
379 const std::vector<CreditCard*>& credit_cards = 363 }
380 personal_data_manager_->GetCreditCards(); 364
381 size_t index_size_t = static_cast<size_t>(index); 365 base::android::ScopedJavaLocalRef<jobjectArray>
382 DCHECK_LT(index_size_t, credit_cards.size()); 366 PersonalDataManagerAndroid::GetCreditCardGUIDsToSuggest(
383 return CreateJavaCreditCardFromNative(env, *credit_cards[index_size_t]); 367 JNIEnv* env,
368 const base::android::JavaParamRef<jobject>& unused_obj) {
369 return GetCreditCardGUIDs(env,
370 personal_data_manager_->GetCreditCardsToSuggest());
384 } 371 }
385 372
386 ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetCreditCardByGUID( 373 ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetCreditCardByGUID(
387 JNIEnv* env, 374 JNIEnv* env,
388 const JavaParamRef<jobject>& unused_obj, 375 const JavaParamRef<jobject>& unused_obj,
389 const JavaParamRef<jstring>& jguid) { 376 const JavaParamRef<jstring>& jguid) {
390 CreditCard* card = personal_data_manager_->GetCreditCardByGUID( 377 CreditCard* card = personal_data_manager_->GetCreditCardByGUID(
391 ConvertJavaStringToUTF8(env, jguid)); 378 ConvertJavaStringToUTF8(env, jguid));
392 if (!card) 379 if (!card)
393 return ScopedJavaLocalRef<jobject>(); 380 return ScopedJavaLocalRef<jobject>();
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 447
461 Java_PersonalDataManager_personalDataChanged(env, 448 Java_PersonalDataManager_personalDataChanged(env,
462 weak_java_obj_.get(env).obj()); 449 weak_java_obj_.get(env).obj());
463 } 450 }
464 451
465 // static 452 // static
466 bool PersonalDataManagerAndroid::Register(JNIEnv* env) { 453 bool PersonalDataManagerAndroid::Register(JNIEnv* env) {
467 return RegisterNativesImpl(env); 454 return RegisterNativesImpl(env);
468 } 455 }
469 456
457 void PersonalDataManagerAndroid::SetProfileUseStatsForTesting(
458 JNIEnv* env,
459 const JavaParamRef<jobject>& unused_obj,
460 const JavaParamRef<jstring>& jguid,
461 jint count,
462 jint date) {
463 DCHECK(count >= 0 && date >= 0);
464
465 AutofillProfile* profile = personal_data_manager_->GetProfileByGUID(
466 ConvertJavaStringToUTF8(env, jguid));
467 if (!profile)
468 return;
469
470 profile->set_use_count(static_cast<size_t>(count));
471 profile->set_use_date(base::Time::FromTimeT(date));
472 }
473
474 void PersonalDataManagerAndroid::SetCreditCardUseStatsForTesting(
475 JNIEnv* env,
476 const JavaParamRef<jobject>& unused_obj,
477 const JavaParamRef<jstring>& jguid,
478 jint count,
479 jint date) {
480 DCHECK(count >= 0 && date >= 0);
481
482 CreditCard* card = personal_data_manager_->GetCreditCardByGUID(
483 ConvertJavaStringToUTF8(env, jguid));
484 if (!card)
485 return;
486
487 card->set_use_count(static_cast<size_t>(count));
488 card->set_use_date(base::Time::FromTimeT(date));
489 }
490
491 ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileGUIDs(
492 JNIEnv* env,
493 const std::vector<AutofillProfile*>& profiles) {
494 std::vector<base::string16> guids;
495 for (AutofillProfile* profile : profiles)
496 guids.push_back(base::UTF8ToUTF16(profile->guid()));
497
498 return base::android::ToJavaArrayOfStrings(env, guids);
499 }
500
501 ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetCreditCardGUIDs(
502 JNIEnv* env,
503 const std::vector<CreditCard*>& credit_cards) {
504 std::vector<base::string16> guids;
505 for (CreditCard* credit_card : credit_cards)
506 guids.push_back(base::UTF8ToUTF16(credit_card->guid()));
507
508 return base::android::ToJavaArrayOfStrings(env, guids);
509 }
510
511 ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileLabels(
512 JNIEnv* env,
513 bool address_only,
514 std::vector<AutofillProfile*> profiles) {
515 std::unique_ptr<std::vector<ServerFieldType>> suggested_fields;
516 size_t minimal_fields_shown = 2;
517 if (address_only) {
518 suggested_fields.reset(new std::vector<ServerFieldType>);
519 suggested_fields->push_back(COMPANY_NAME);
520 suggested_fields->push_back(ADDRESS_HOME_LINE1);
521 suggested_fields->push_back(ADDRESS_HOME_LINE2);
522 suggested_fields->push_back(ADDRESS_HOME_DEPENDENT_LOCALITY);
523 suggested_fields->push_back(ADDRESS_HOME_CITY);
524 suggested_fields->push_back(ADDRESS_HOME_STATE);
525 suggested_fields->push_back(ADDRESS_HOME_ZIP);
526 suggested_fields->push_back(ADDRESS_HOME_SORTING_CODE);
527 suggested_fields->push_back(ADDRESS_HOME_COUNTRY);
528 minimal_fields_shown = suggested_fields->size();
529 }
530
531 std::vector<base::string16> labels;
532 AutofillProfile::CreateInferredLabels(
533 profiles, suggested_fields.get(), NAME_FULL, minimal_fields_shown,
534 g_browser_process->GetApplicationLocale(), &labels);
535
536 return base::android::ToJavaArrayOfStrings(env, labels);
537 }
538
470 // Returns whether the Autofill feature is enabled. 539 // Returns whether the Autofill feature is enabled.
471 static jboolean IsAutofillEnabled(JNIEnv* env, 540 static jboolean IsAutofillEnabled(JNIEnv* env,
472 const JavaParamRef<jclass>& clazz) { 541 const JavaParamRef<jclass>& clazz) {
473 return GetPrefs()->GetBoolean(autofill::prefs::kAutofillEnabled); 542 return GetPrefs()->GetBoolean(autofill::prefs::kAutofillEnabled);
474 } 543 }
475 544
476 // Enables or disables the Autofill feature. 545 // Enables or disables the Autofill feature.
477 static void SetAutofillEnabled(JNIEnv* env, 546 static void SetAutofillEnabled(JNIEnv* env,
478 const JavaParamRef<jclass>& clazz, 547 const JavaParamRef<jclass>& clazz,
479 jboolean enable) { 548 jboolean enable) {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 base::android::ConvertJavaStringToUTF16(env, jcountry_name))); 580 base::android::ConvertJavaStringToUTF16(env, jcountry_name)));
512 } 581 }
513 582
514 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { 583 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
515 PersonalDataManagerAndroid* personal_data_manager_android = 584 PersonalDataManagerAndroid* personal_data_manager_android =
516 new PersonalDataManagerAndroid(env, obj); 585 new PersonalDataManagerAndroid(env, obj);
517 return reinterpret_cast<intptr_t>(personal_data_manager_android); 586 return reinterpret_cast<intptr_t>(personal_data_manager_android);
518 } 587 }
519 588
520 } // namespace autofill 589 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698