Index: components/autofill/core/browser/personal_data_manager.h |
diff --git a/components/autofill/core/browser/personal_data_manager.h b/components/autofill/core/browser/personal_data_manager.h |
index 49ef30a3949057fd853efe242254ffd17d9ab666..14c7702f5d02f831463bddc987e9e398af2fc797 100644 |
--- a/components/autofill/core/browser/personal_data_manager.h |
+++ b/components/autofill/core/browser/personal_data_manager.h |
@@ -18,6 +18,7 @@ |
#include "components/autofill/core/browser/autofill_profile.h" |
#include "components/autofill/core/browser/credit_card.h" |
#include "components/autofill/core/browser/field_types.h" |
+#include "components/autofill/core/browser/suggestion.h" |
#include "components/autofill/core/browser/webdata/autofill_webdata_service.h" |
#include "components/autofill/core/browser/webdata/autofill_webdata_service_observer.h" |
#include "components/keyed_service/core/keyed_service.h" |
@@ -48,10 +49,6 @@ class PersonalDataManager : public KeyedService, |
public WebDataServiceConsumer, |
public AutofillWebDataServiceObserverOnUIThread { |
public: |
- // A pair of GUID and variant index. Represents a single FormGroup and a |
- // specific data variant. |
- typedef std::pair<std::string, size_t> GUIDPair; |
- |
explicit PersonalDataManager(const std::string& app_locale); |
~PersonalDataManager() override; |
@@ -146,10 +143,7 @@ class PersonalDataManager : public KeyedService, |
bool field_is_autofilled, |
const std::vector<ServerFieldType>& other_field_types, |
const base::Callback<bool(const AutofillProfile&)>& filter, |
- std::vector<base::string16>* values, |
- std::vector<base::string16>* labels, |
- std::vector<base::string16>* icons, |
- std::vector<GUIDPair>* guid_pairs); |
+ std::vector<Suggestion>* suggestions); |
Evan Stade
2014/12/10 23:11:14
can be a return value now instead of a series of o
|
// Gets credit cards that can suggest data for |type|. See |
// GetProfileSuggestions for argument descriptions. The variant in each |
@@ -157,10 +151,7 @@ class PersonalDataManager : public KeyedService, |
void GetCreditCardSuggestions( |
const AutofillType& type, |
const base::string16& field_contents, |
- std::vector<base::string16>* values, |
- std::vector<base::string16>* labels, |
- std::vector<base::string16>* icons, |
- std::vector<GUIDPair>* guid_pairs); |
+ std::vector<Suggestion>* suggestions); |
// Re-loads profiles and credit cards from the WebDatabase asynchronously. |
// In the general case, this is a no-op and will re-create the same |