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/signin/easy_unlock_service.h" | 5 #include "chrome/browser/signin/easy_unlock_service.h" |
6 | 6 |
7 #include "apps/app_lifetime_monitor.h" | 7 #include "apps/app_lifetime_monitor.h" |
8 #include "apps/app_lifetime_monitor_factory.h" | 8 #include "apps/app_lifetime_monitor_factory.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/guid.h" | 11 #include "base/guid.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/macros.h" |
13 #include "base/metrics/histogram_macros.h" | 14 #include "base/metrics/histogram_macros.h" |
14 #include "base/prefs/pref_registry_simple.h" | 15 #include "base/prefs/pref_registry_simple.h" |
15 #include "base/prefs/pref_service.h" | 16 #include "base/prefs/pref_service.h" |
16 #include "base/prefs/scoped_user_pref_update.h" | 17 #include "base/prefs/scoped_user_pref_update.h" |
17 #include "base/sys_info.h" | 18 #include "base/sys_info.h" |
18 #include "base/thread_task_runner_handle.h" | 19 #include "base/thread_task_runner_handle.h" |
19 #include "base/time/time.h" | 20 #include "base/time/time.h" |
20 #include "base/values.h" | 21 #include "base/values.h" |
21 #include "base/version.h" | 22 #include "base/version.h" |
| 23 #include "build/build_config.h" |
22 #include "chrome/browser/browser_process.h" | 24 #include "chrome/browser/browser_process.h" |
23 #include "chrome/browser/profiles/profile.h" | 25 #include "chrome/browser/profiles/profile.h" |
24 #include "chrome/browser/signin/chrome_proximity_auth_client.h" | 26 #include "chrome/browser/signin/chrome_proximity_auth_client.h" |
25 #include "chrome/browser/signin/easy_unlock_app_manager.h" | 27 #include "chrome/browser/signin/easy_unlock_app_manager.h" |
26 #include "chrome/browser/signin/easy_unlock_service_factory.h" | 28 #include "chrome/browser/signin/easy_unlock_service_factory.h" |
27 #include "chrome/browser/signin/easy_unlock_service_observer.h" | 29 #include "chrome/browser/signin/easy_unlock_service_observer.h" |
28 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 30 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
29 #include "chrome/browser/signin/signin_manager_factory.h" | 31 #include "chrome/browser/signin/signin_manager_factory.h" |
30 #include "chrome/common/chrome_switches.h" | 32 #include "chrome/common/chrome_switches.h" |
31 #include "chrome/common/extensions/extension_constants.h" | 33 #include "chrome/common/extensions/extension_constants.h" |
(...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
915 | 917 |
916 // TODO(tbarzic): Set check_private_key only if previous sign-in attempt | 918 // TODO(tbarzic): Set check_private_key only if previous sign-in attempt |
917 // failed. | 919 // failed. |
918 EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_) | 920 EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_) |
919 ->PrepareTpmKey(true /* check_private_key */, | 921 ->PrepareTpmKey(true /* check_private_key */, |
920 base::Closure()); | 922 base::Closure()); |
921 #endif // defined(OS_CHROMEOS) | 923 #endif // defined(OS_CHROMEOS) |
922 | 924 |
923 tpm_key_checked_ = true; | 925 tpm_key_checked_ = true; |
924 } | 926 } |
OLD | NEW |