Chromium Code Reviews| 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 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_ | 5 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_ |
| 6 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_ | 6 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <iosfwd> | 10 #include <iosfwd> |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 107 // Returns true if the data in this AutofillProfile is a subset of the data in | 107 // Returns true if the data in this AutofillProfile is a subset of the data in |
| 108 // |profile|. | 108 // |profile|. |
| 109 bool IsSubsetOf(const AutofillProfile& profile, | 109 bool IsSubsetOf(const AutofillProfile& profile, |
| 110 const std::string& app_locale) const; | 110 const std::string& app_locale) const; |
| 111 | 111 |
| 112 // Like IsSubsetOf, but only considers the types present in |types|. | 112 // Like IsSubsetOf, but only considers the types present in |types|. |
| 113 bool IsSubsetOfForFieldSet(const AutofillProfile& profile, | 113 bool IsSubsetOfForFieldSet(const AutofillProfile& profile, |
| 114 const std::string& app_locale, | 114 const std::string& app_locale, |
| 115 const ServerFieldTypeSet& types) const; | 115 const ServerFieldTypeSet& types) const; |
| 116 | 116 |
| 117 // Overwrites the field data in |profile| with this Profile. Returns |true| if | 117 // Overwrites the field data in this Profile with the non-empty ones in |
|
Mathieu
2016/04/29 12:18:43
nit: ones -> fields
sebsg
2016/04/29 15:04:49
Done.
| |
| 118 // at least one field was overwritten. | 118 // |profile|. Returns |true| if at least one field was overwritten. |
|
Mathieu
2016/04/29 12:18:43
Should we add a note about how origin, language_co
sebsg
2016/04/29 15:04:49
Done.
| |
| 119 bool OverwriteWith(const AutofillProfile& profile, | 119 bool OverwriteWith(const AutofillProfile& profile, |
| 120 const std::string& app_locale); | 120 const std::string& app_locale); |
| 121 | 121 |
| 122 // Saves info from |profile| into |this|, provided |this| and |profile| do not | 122 // Saves info from |profile| into |this|, provided |this| and |profile| do not |
| 123 // have any direct conflicts (i.e. data is present but different). Will not | 123 // have any direct conflicts (i.e. data is present but different). Will not |
| 124 // make changes if |this| is verified and |profile| is not. Returns true if | 124 // make changes if |this| is verified and |profile| is not. Returns true if |
| 125 // |this| and |profile| are similar. | 125 // |this| and |profile| are similar. |
| 126 bool SaveAdditionalInfo(const AutofillProfile& profile, | 126 bool SaveAdditionalInfo(const AutofillProfile& profile, |
| 127 const std::string& app_locale); | 127 const std::string& app_locale); |
| 128 | 128 |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 247 // a hash of the contents. | 247 // a hash of the contents. |
| 248 std::string server_id_; | 248 std::string server_id_; |
| 249 }; | 249 }; |
| 250 | 250 |
| 251 // So we can compare AutofillProfiles with EXPECT_EQ(). | 251 // So we can compare AutofillProfiles with EXPECT_EQ(). |
| 252 std::ostream& operator<<(std::ostream& os, const AutofillProfile& profile); | 252 std::ostream& operator<<(std::ostream& os, const AutofillProfile& profile); |
| 253 | 253 |
| 254 } // namespace autofill | 254 } // namespace autofill |
| 255 | 255 |
| 256 #endif // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_ | 256 #endif // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_ |
| OLD | NEW |