chrome/browser/signin/easy_unlock_service.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/signin/easy_unlock_service.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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 | « chrome/browser/signin/cross_device_promo_factory.cc ('k') | chrome/browser/signin/easy_unlock_service_regular.h » ('j') | no next file with comments »

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 <utility>	7 #include <utility>

8	8

9 #include "apps/app_lifetime_monitor.h"	9 #include "apps/app_lifetime_monitor.h"

10 #include "apps/app_lifetime_monitor_factory.h"	10 #include "apps/app_lifetime_monitor_factory.h"

11 #include "base/bind.h"	11 #include "base/bind.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/guid.h"	13 #include "base/guid.h"

14 #include "base/logging.h"	14 #include "base/logging.h"

15 #include "base/macros.h"	15 #include "base/macros.h"

16 #include "base/metrics/histogram_macros.h"	16 #include "base/metrics/histogram_macros.h"

17 #include "base/prefs/pref_registry_simple.h"

18 #include "base/prefs/pref_service.h"

19 #include "base/prefs/scoped_user_pref_update.h"

20 #include "base/sys_info.h"	17 #include "base/sys_info.h"

21 #include "base/thread_task_runner_handle.h"	18 #include "base/thread_task_runner_handle.h"

22 #include "base/time/time.h"	19 #include "base/time/time.h"

23 #include "base/values.h"	20 #include "base/values.h"

24 #include "base/version.h"	21 #include "base/version.h"

25 #include "build/build_config.h"	22 #include "build/build_config.h"

26 #include "chrome/browser/browser_process.h"	23 #include "chrome/browser/browser_process.h"

27 #include "chrome/browser/profiles/profile.h"	24 #include "chrome/browser/profiles/profile.h"

28 #include "chrome/browser/signin/chrome_proximity_auth_client.h"	25 #include "chrome/browser/signin/chrome_proximity_auth_client.h"

29 #include "chrome/browser/signin/easy_unlock_app_manager.h"	26 #include "chrome/browser/signin/easy_unlock_app_manager.h"

30 #include "chrome/browser/signin/easy_unlock_service_factory.h"	27 #include "chrome/browser/signin/easy_unlock_service_factory.h"

31 #include "chrome/browser/signin/easy_unlock_service_observer.h"	28 #include "chrome/browser/signin/easy_unlock_service_observer.h"

32 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	29 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

33 #include "chrome/browser/signin/signin_manager_factory.h"	30 #include "chrome/browser/signin/signin_manager_factory.h"

34 #include "chrome/common/chrome_switches.h"	31 #include "chrome/common/chrome_switches.h"

35 #include "chrome/common/extensions/extension_constants.h"	32 #include "chrome/common/extensions/extension_constants.h"

36 #include "chrome/common/pref_names.h"	33 #include "chrome/common/pref_names.h"

37 #include "components/pref_registry/pref_registry_syncable.h"	34 #include "components/pref_registry/pref_registry_syncable.h"

	35 #include "components/prefs/pref_registry_simple.h"

	36 #include "components/prefs/pref_service.h"

	37 #include "components/prefs/scoped_user_pref_update.h"

38 #include "components/proximity_auth/cryptauth/cryptauth_client_impl.h"	38 #include "components/proximity_auth/cryptauth/cryptauth_client_impl.h"

39 #include "components/proximity_auth/cryptauth/cryptauth_device_manager.h"	39 #include "components/proximity_auth/cryptauth/cryptauth_device_manager.h"

40 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"	40 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"

41 #include "components/proximity_auth/cryptauth/secure_message_delegate.h"	41 #include "components/proximity_auth/cryptauth/secure_message_delegate.h"

42 #include "components/proximity_auth/logging/logging.h"	42 #include "components/proximity_auth/logging/logging.h"

43 #include "components/proximity_auth/proximity_auth_pref_manager.h"	43 #include "components/proximity_auth/proximity_auth_pref_manager.h"

44 #include "components/proximity_auth/proximity_auth_system.h"	44 #include "components/proximity_auth/proximity_auth_system.h"

45 #include "components/proximity_auth/screenlock_bridge.h"	45 #include "components/proximity_auth/screenlock_bridge.h"

46 #include "components/proximity_auth/switches.h"	46 #include "components/proximity_auth/switches.h"

47 #include "components/signin/core/browser/profile_oauth2_token_service.h"	47 #include "components/signin/core/browser/profile_oauth2_token_service.h"

(...skipping 871 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
919	919

920 // TODO(tbarzic): Set check_private_key only if previous sign-in attempt	920 // TODO(tbarzic): Set check_private_key only if previous sign-in attempt

921 // failed.	921 // failed.

922 EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_)	922 EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_)

923 ->PrepareTpmKey(true /* check_private_key */,	923 ->PrepareTpmKey(true /* check_private_key */,

924 base::Closure());	924 base::Closure());

925 #endif // defined(OS_CHROMEOS)	925 #endif // defined(OS_CHROMEOS)

926	926

927 tpm_key_checked_ = true;	927 tpm_key_checked_ = true;

928 }	928 }

OLD	NEW