OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/password_manager/password_store_mac.h" | 5 #include "chrome/browser/password_manager/password_store_mac.h" |
6 #include "chrome/browser/password_manager/password_store_mac_internal.h" | |
7 | 6 |
8 #include <CoreServices/CoreServices.h> | 7 #include <CoreServices/CoreServices.h> |
| 8 #include <stddef.h> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
11 #include <utility> | 11 #include <utility> |
12 #include <vector> | 12 #include <vector> |
13 | 13 |
14 #include "base/callback.h" | 14 #include "base/callback.h" |
15 #include "base/logging.h" | 15 #include "base/logging.h" |
16 #include "base/mac/foundation_util.h" | 16 #include "base/mac/foundation_util.h" |
17 #include "base/mac/mac_logging.h" | 17 #include "base/mac/mac_logging.h" |
| 18 #include "base/macros.h" |
18 #include "base/message_loop/message_loop.h" | 19 #include "base/message_loop/message_loop.h" |
19 #include "base/metrics/histogram_macros.h" | 20 #include "base/metrics/histogram_macros.h" |
20 #include "base/stl_util.h" | 21 #include "base/stl_util.h" |
21 #include "base/strings/string_util.h" | 22 #include "base/strings/string_util.h" |
22 #include "base/strings/utf_string_conversions.h" | 23 #include "base/strings/utf_string_conversions.h" |
23 #include "chrome/browser/mac/security_wrappers.h" | 24 #include "chrome/browser/mac/security_wrappers.h" |
| 25 #include "chrome/browser/password_manager/password_store_mac_internal.h" |
24 #include "components/os_crypt/os_crypt.h" | 26 #include "components/os_crypt/os_crypt.h" |
25 #include "components/password_manager/core/browser/affiliation_utils.h" | 27 #include "components/password_manager/core/browser/affiliation_utils.h" |
26 #include "components/password_manager/core/browser/login_database.h" | 28 #include "components/password_manager/core/browser/login_database.h" |
27 #include "components/password_manager/core/browser/password_store_change.h" | 29 #include "components/password_manager/core/browser/password_store_change.h" |
28 #include "content/public/browser/browser_thread.h" | 30 #include "content/public/browser/browser_thread.h" |
29 #include "crypto/apple_keychain.h" | 31 #include "crypto/apple_keychain.h" |
30 #include "url/origin.h" | 32 #include "url/origin.h" |
31 | 33 |
32 using autofill::PasswordForm; | 34 using autofill::PasswordForm; |
33 using crypto::AppleKeychain; | 35 using crypto::AppleKeychain; |
(...skipping 1331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1365 ScopedVector<PasswordForm> forms_with_keychain_entry; | 1367 ScopedVector<PasswordForm> forms_with_keychain_entry; |
1366 internal_keychain_helpers::GetPasswordsForForms(*keychain_, &database_forms, | 1368 internal_keychain_helpers::GetPasswordsForForms(*keychain_, &database_forms, |
1367 &forms_with_keychain_entry); | 1369 &forms_with_keychain_entry); |
1368 | 1370 |
1369 // Clean up any orphaned database entries. | 1371 // Clean up any orphaned database entries. |
1370 RemoveDatabaseForms(&database_forms); | 1372 RemoveDatabaseForms(&database_forms); |
1371 | 1373 |
1372 // Move the orphaned DB forms to the output parameter. | 1374 // Move the orphaned DB forms to the output parameter. |
1373 AppendSecondToFirst(orphaned_forms, &database_forms); | 1375 AppendSecondToFirst(orphaned_forms, &database_forms); |
1374 } | 1376 } |
OLD | NEW |