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

Side by Side Diff: chromeos/tpm_token_loader.h

Issue 408853004: Remove nss_util.h dependency from FakeCryptohomeClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chromeos/dbus/fake_cryptohome_client.cc ('k') | chromeos/tpm_token_loader.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef CHROMEOS_TPM_TOKEN_LOADER_H_ 5 #ifndef CHROMEOS_TPM_TOKEN_LOADER_H_
6 #define CHROMEOS_TPM_TOKEN_LOADER_H_ 6 #define CHROMEOS_TPM_TOKEN_LOADER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 TPM_TOKEN_INFO_RECEIVED, 120 TPM_TOKEN_INFO_RECEIVED,
121 TPM_TOKEN_INITIALIZED, 121 TPM_TOKEN_INITIALIZED,
122 }; 122 };
123 TPMTokenState tpm_token_state_; 123 TPMTokenState tpm_token_state_;
124 124
125 // The current request delay before the next attempt to initialize the 125 // The current request delay before the next attempt to initialize the
126 // TPM. Will be adapted after each attempt. 126 // TPM. Will be adapted after each attempt.
127 base::TimeDelta tpm_request_delay_; 127 base::TimeDelta tpm_request_delay_;
128 128
129 // Cached TPM token info. 129 // Cached TPM token info.
130 std::string tpm_token_name_;
131 int tpm_token_slot_id_; 130 int tpm_token_slot_id_;
132 std::string tpm_user_pin_; 131 std::string tpm_user_pin_;
133 132
134 base::ThreadChecker thread_checker_; 133 base::ThreadChecker thread_checker_;
135 134
136 // TaskRunner for crypto calls. 135 // TaskRunner for crypto calls.
137 scoped_refptr<base::SequencedTaskRunner> crypto_task_runner_; 136 scoped_refptr<base::SequencedTaskRunner> crypto_task_runner_;
138 137
139 base::WeakPtrFactory<TPMTokenLoader> weak_factory_; 138 base::WeakPtrFactory<TPMTokenLoader> weak_factory_;
140 139
141 DISALLOW_COPY_AND_ASSIGN(TPMTokenLoader); 140 DISALLOW_COPY_AND_ASSIGN(TPMTokenLoader);
142 }; 141 };
143 142
144 } // namespace chromeos 143 } // namespace chromeos
145 144
146 #endif // CHROMEOS_TPM_TOKEN_LOADER_H_ 145 #endif // CHROMEOS_TPM_TOKEN_LOADER_H_
OLDNEW
« no previous file with comments | « chromeos/dbus/fake_cryptohome_client.cc ('k') | chromeos/tpm_token_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698