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

Side by Side Diff: chrome/browser/chromeos/login/parallel_authenticator.h

Issue 270663002: Implemented profile-aware owner key loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes. Created 6 years, 7 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
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_CHROMEOS_LOGIN_PARALLEL_AUTHENTICATOR_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_PARALLEL_AUTHENTICATOR_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_PARALLEL_AUTHENTICATOR_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_PARALLEL_AUTHENTICATOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/synchronization/lock.h" 14 #include "base/synchronization/lock.h"
15 #include "chrome/browser/chromeos/login/auth_attempt_state.h" 15 #include "chrome/browser/chromeos/login/auth_attempt_state.h"
16 #include "chrome/browser/chromeos/login/auth_attempt_state_resolver.h" 16 #include "chrome/browser/chromeos/login/auth_attempt_state_resolver.h"
17 #include "chrome/browser/chromeos/login/authenticator.h" 17 #include "chrome/browser/chromeos/login/authenticator.h"
18 #include "chrome/browser/chromeos/login/owner_key_reloader.h"
18 #include "chrome/browser/chromeos/login/test_attempt_state.h" 19 #include "chrome/browser/chromeos/login/test_attempt_state.h"
19 #include "chrome/browser/chromeos/settings/device_settings_service.h" 20 #include "chrome/browser/chromeos/settings/device_settings_service.h"
20 #include "google_apis/gaia/gaia_auth_consumer.h" 21 #include "google_apis/gaia/gaia_auth_consumer.h"
21 22
22 class LoginFailure; 23 class LoginFailure;
23 class Profile; 24 class Profile;
24 25
25 namespace chromeos { 26 namespace chromeos {
26 27
27 class LoginStatusConsumer; 28 class LoginStatusConsumer;
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 bool owner_is_verified_; 241 bool owner_is_verified_;
241 bool user_can_login_; 242 bool user_can_login_;
242 243
243 // Flag indicating to delete the user's cryptohome the login fails. 244 // Flag indicating to delete the user's cryptohome the login fails.
244 bool remove_user_data_on_failure_; 245 bool remove_user_data_on_failure_;
245 246
246 // When |remove_user_data_on_failure_| is set, we delay calling 247 // When |remove_user_data_on_failure_| is set, we delay calling
247 // consumer_->OnLoginFailure() until we removed the user cryptohome. 248 // consumer_->OnLoginFailure() until we removed the user cryptohome.
248 const LoginFailure* delayed_login_failure_; 249 const LoginFailure* delayed_login_failure_;
249 250
251 OwnerKeyReloader owner_key_reloader_;
252
250 DISALLOW_COPY_AND_ASSIGN(ParallelAuthenticator); 253 DISALLOW_COPY_AND_ASSIGN(ParallelAuthenticator);
251 }; 254 };
252 255
253 } // namespace chromeos 256 } // namespace chromeos
254 257
255 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_PARALLEL_AUTHENTICATOR_H_ 258 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_PARALLEL_AUTHENTICATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698