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 "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h" | 5 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h" |
6 | 6 |
7 #include "base/thread_task_runner_handle.h" | 7 #include "base/thread_task_runner_handle.h" |
8 #include "chrome/browser/chromeos/ownership/owner_settings_service.h" | 8 #include "chrome/browser/chromeos/ownership/owner_settings_service.h" |
| 9 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h" |
9 #include "chrome/browser/chromeos/settings/cros_settings.h" | 10 #include "chrome/browser/chromeos/settings/cros_settings.h" |
10 #include "components/user_manager/user_manager.h" | 11 #include "components/user_manager/user_manager.h" |
11 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" |
12 | 13 |
13 using content::BrowserThread; | 14 using content::BrowserThread; |
14 | 15 |
15 namespace chromeos { | 16 namespace chromeos { |
16 | 17 |
17 ChromeCryptohomeAuthenticator::ChromeCryptohomeAuthenticator( | 18 ChromeCryptohomeAuthenticator::ChromeCryptohomeAuthenticator( |
18 AuthStatusConsumer* consumer) | 19 AuthStatusConsumer* consumer) |
(...skipping 17 matching lines...) Expand all Loading... |
36 const UserContext& context, | 37 const UserContext& context, |
37 const IsOwnerCallback& callback) { | 38 const IsOwnerCallback& callback) { |
38 // |IsOwnerForSafeModeAsync| expects logged in state to be | 39 // |IsOwnerForSafeModeAsync| expects logged in state to be |
39 // LOGGED_IN_SAFE_MODE. | 40 // LOGGED_IN_SAFE_MODE. |
40 if (LoginState::IsInitialized()) { | 41 if (LoginState::IsInitialized()) { |
41 LoginState::Get()->SetLoggedInState(LoginState::LOGGED_IN_SAFE_MODE, | 42 LoginState::Get()->SetLoggedInState(LoginState::LOGGED_IN_SAFE_MODE, |
42 LoginState::LOGGED_IN_USER_NONE); | 43 LoginState::LOGGED_IN_USER_NONE); |
43 } | 44 } |
44 | 45 |
45 OwnerSettingsService::IsOwnerForSafeModeAsync( | 46 OwnerSettingsService::IsOwnerForSafeModeAsync( |
46 context.GetUserID(), context.GetUserIDHash(), callback); | 47 context.GetUserID(), |
| 48 context.GetUserIDHash(), |
| 49 OwnerSettingsServiceFactory::GetInstance()->GetOwnerKeyUtil(), |
| 50 callback); |
47 } | 51 } |
48 | 52 |
49 } // namespace chromeos | 53 } // namespace chromeos |
OLD | NEW |