OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/password_manager/core/browser/password_syncable_service.h" | 5 #include "components/password_manager/core/browser/password_syncable_service.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 CopyStringField(password_value); | 179 CopyStringField(password_value); |
180 CopyField(preferred); | 180 CopyField(preferred); |
181 password_specifics->set_date_created( | 181 password_specifics->set_date_created( |
182 password_form.date_created.ToInternalValue()); | 182 password_form.date_created.ToInternalValue()); |
183 password_specifics->set_blacklisted(password_form.blacklisted_by_user); | 183 password_specifics->set_blacklisted(password_form.blacklisted_by_user); |
184 CopyField(type); | 184 CopyField(type); |
185 CopyField(times_used); | 185 CopyField(times_used); |
186 CopyStringField(display_name); | 186 CopyStringField(display_name); |
187 password_specifics->set_avatar_url(password_form.icon_url.spec()); | 187 password_specifics->set_avatar_url(password_form.icon_url.spec()); |
188 password_specifics->set_federation_url( | 188 password_specifics->set_federation_url( |
189 password_form.federation_origin.unique() | 189 password_form.federation_origin.opaque() |
190 ? std::string() | 190 ? std::string() |
191 : password_form.federation_origin.Serialize()); | 191 : password_form.federation_origin.Serialize()); |
192 #undef CopyStringField | 192 #undef CopyStringField |
193 #undef CopyField | 193 #undef CopyField |
194 } | 194 } |
195 | 195 |
196 struct AndroidMergeResult { | 196 struct AndroidMergeResult { |
197 // New value for Android entry in the correct format. | 197 // New value for Android entry in the correct format. |
198 base::Optional<syncer::SyncData> new_android_correct; | 198 base::Optional<syncer::SyncData> new_android_correct; |
199 // New value for Android autofill entry. | 199 // New value for Android autofill entry. |
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
766 | 766 |
767 std::string MakePasswordSyncTag(const autofill::PasswordForm& password) { | 767 std::string MakePasswordSyncTag(const autofill::PasswordForm& password) { |
768 return (net::EscapePath(password.origin.spec()) + "|" + | 768 return (net::EscapePath(password.origin.spec()) + "|" + |
769 net::EscapePath(base::UTF16ToUTF8(password.username_element)) + "|" + | 769 net::EscapePath(base::UTF16ToUTF8(password.username_element)) + "|" + |
770 net::EscapePath(base::UTF16ToUTF8(password.username_value)) + "|" + | 770 net::EscapePath(base::UTF16ToUTF8(password.username_value)) + "|" + |
771 net::EscapePath(base::UTF16ToUTF8(password.password_element)) + "|" + | 771 net::EscapePath(base::UTF16ToUTF8(password.password_element)) + "|" + |
772 net::EscapePath(password.signon_realm)); | 772 net::EscapePath(password.signon_realm)); |
773 } | 773 } |
774 | 774 |
775 } // namespace password_manager | 775 } // namespace password_manager |
OLD | NEW |