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

Side by Side Diff: chrome/browser/password_manager/password_store_mac.h

Issue 838453003: Open the LoginDatabase on the DB thread, not the UI thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac namespace fixes. Created 5 years, 11 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 (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 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_H_ 5 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_H_
6 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_H_ 6 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
11 #include "base/files/file_path.h"
11 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
12 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
13 #include "components/password_manager/core/browser/login_database.h" 14 #include "components/password_manager/core/browser/login_database.h"
14 #include "components/password_manager/core/browser/password_store.h" 15 #include "components/password_manager/core/browser/password_store.h"
15 16
16 namespace crypto { 17 namespace crypto {
17 class AppleKeychain; 18 class AppleKeychain;
18 } 19 }
19 20
20 namespace password_manager { 21 namespace password_manager {
21 class LoginDatabase; 22 class LoginDatabase;
22 } 23 }
23 24
24 // Implements PasswordStore on top of the OS X Keychain, with an internal 25 // Implements PasswordStore on top of the OS X Keychain, with an internal
25 // database for extra metadata. For an overview of the interactions with the 26 // database for extra metadata. For an overview of the interactions with the
26 // Keychain, as well as the rationale for some of the behaviors, see the 27 // Keychain, as well as the rationale for some of the behaviors, see the
27 // Keychain integration design doc: 28 // Keychain integration design doc:
28 // http://dev.chromium.org/developers/design-documents/os-x-password-manager-key chain-integration 29 // http://dev.chromium.org/developers/design-documents/os-x-password-manager-key chain-integration
29 class PasswordStoreMac : public password_manager::PasswordStore { 30 class PasswordStoreMac : public password_manager::PasswordStore {
30 public: 31 public:
31 // Takes ownership of |keychain| and |login_db|, both of which must be 32 // Takes ownership of |keychain| and |login_db|, both of which must be
32 // non-NULL. 33 // non-NULL.
33 PasswordStoreMac( 34 PasswordStoreMac(
34 scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner, 35 scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner,
35 scoped_refptr<base::SingleThreadTaskRunner> db_thread_runner, 36 scoped_refptr<base::SingleThreadTaskRunner> db_thread_runner,
36 crypto::AppleKeychain* keychain, 37 crypto::AppleKeychain* keychain,
37 password_manager::LoginDatabase* login_db); 38 const base::FilePath& login_db_file_path);
38 39
39 // Initializes |thread_|. 40 // Initializes |thread_|.
40 bool Init(const syncer::SyncableService::StartSyncFlare& flare) override; 41 bool Init(const syncer::SyncableService::StartSyncFlare& flare) override;
41 42
42 // Stops |thread_|. 43 // Stops |thread_|.
43 void Shutdown() override; 44 void Shutdown() override;
44 45
46 // Used for testing.
47 password_manager::LoginDatabase* login_metadata_db() const {
48 return login_metadata_db_.get();
49 }
50
45 protected: 51 protected:
46 ~PasswordStoreMac() override; 52 ~PasswordStoreMac() override;
47 53
54 // Opens |login_metadata_db_| on the background thread.
55 void InitOnBackgroundThread();
56
48 scoped_refptr<base::SingleThreadTaskRunner> GetBackgroundTaskRunner() 57 scoped_refptr<base::SingleThreadTaskRunner> GetBackgroundTaskRunner()
49 override; 58 override;
50 59
51 private: 60 private:
52 void ReportMetricsImpl(const std::string& sync_username, 61 void ReportMetricsImpl(const std::string& sync_username,
53 bool custom_passphrase_sync_enabled) override; 62 bool custom_passphrase_sync_enabled) override;
54 password_manager::PasswordStoreChangeList AddLoginImpl( 63 password_manager::PasswordStoreChangeList AddLoginImpl(
55 const autofill::PasswordForm& form) override; 64 const autofill::PasswordForm& form) override;
56 password_manager::PasswordStoreChangeList UpdateLoginImpl( 65 password_manager::PasswordStoreChangeList UpdateLoginImpl(
57 const autofill::PasswordForm& form) override; 66 const autofill::PasswordForm& form) override;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 // Removes the given forms from the Keychain. 99 // Removes the given forms from the Keychain.
91 void RemoveKeychainForms( 100 void RemoveKeychainForms(
92 const std::vector<autofill::PasswordForm*>& forms); 101 const std::vector<autofill::PasswordForm*>& forms);
93 102
94 // Searches the database for forms without a corresponding entry in the 103 // Searches the database for forms without a corresponding entry in the
95 // keychain. Removes those forms from the database, and returns them in 104 // keychain. Removes those forms from the database, and returns them in
96 // |forms|. Ownership of |forms| is passed to the caller. 105 // |forms|. Ownership of |forms| is passed to the caller.
97 void CleanOrphanedForms(std::vector<autofill::PasswordForm*>* forms); 106 void CleanOrphanedForms(std::vector<autofill::PasswordForm*>* forms);
98 107
99 scoped_ptr<crypto::AppleKeychain> keychain_; 108 scoped_ptr<crypto::AppleKeychain> keychain_;
109 base::FilePath login_db_file_path_;
100 scoped_ptr<password_manager::LoginDatabase> login_metadata_db_; 110 scoped_ptr<password_manager::LoginDatabase> login_metadata_db_;
101 111
102 // Thread that the synchronous methods are run on. 112 // Thread that the synchronous methods are run on.
103 scoped_ptr<base::Thread> thread_; 113 scoped_ptr<base::Thread> thread_;
104 114
105 DISALLOW_COPY_AND_ASSIGN(PasswordStoreMac); 115 DISALLOW_COPY_AND_ASSIGN(PasswordStoreMac);
106 }; 116 };
107 117
108 #endif // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_H_ 118 #endif // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698