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

Side by Side Diff: chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc

Issue 567553002: TPMTokenLoader: Report both the disabled and enabled state of the TPM. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nss_util_deadcode
Patch Set: Addressed nit. Created 6 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.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 #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/ownership/owner_settings_service_factory.h"
10 #include "chrome/browser/chromeos/settings/cros_settings.h" 10 #include "chrome/browser/chromeos/settings/cros_settings.h"
11 #include "chromeos/login/login_state.h"
11 #include "components/user_manager/user_manager.h" 12 #include "components/user_manager/user_manager.h"
12 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
13 14
14 using content::BrowserThread; 15 using content::BrowserThread;
15 16
16 namespace chromeos { 17 namespace chromeos {
17 18
18 ChromeCryptohomeAuthenticator::ChromeCryptohomeAuthenticator( 19 ChromeCryptohomeAuthenticator::ChromeCryptohomeAuthenticator(
19 AuthStatusConsumer* consumer) 20 AuthStatusConsumer* consumer)
20 : CryptohomeAuthenticator(base::ThreadTaskRunnerHandle::Get(), consumer) { 21 : CryptohomeAuthenticator(base::ThreadTaskRunnerHandle::Get(), consumer) {
(...skipping 22 matching lines...) Expand all
43 LoginState::LOGGED_IN_USER_NONE); 44 LoginState::LOGGED_IN_USER_NONE);
44 } 45 }
45 46
46 OwnerSettingsService::IsOwnerForSafeModeAsync( 47 OwnerSettingsService::IsOwnerForSafeModeAsync(
47 context.GetUserIDHash(), 48 context.GetUserIDHash(),
48 OwnerSettingsServiceFactory::GetInstance()->GetOwnerKeyUtil(), 49 OwnerSettingsServiceFactory::GetInstance()->GetOwnerKeyUtil(),
49 callback); 50 callback);
50 } 51 }
51 52
52 } // namespace chromeos 53 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698