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" |
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
788 case ScreenlockState::PHONE_NOT_LOCKABLE: | 788 case ScreenlockState::PHONE_NOT_LOCKABLE: |
789 return PASSWORD_ENTRY_PHONE_NOT_LOCKABLE; | 789 return PASSWORD_ENTRY_PHONE_NOT_LOCKABLE; |
790 case ScreenlockState::PHONE_UNSUPPORTED: | 790 case ScreenlockState::PHONE_UNSUPPORTED: |
791 return PASSWORD_ENTRY_PHONE_UNSUPPORTED; | 791 return PASSWORD_ENTRY_PHONE_UNSUPPORTED; |
792 case ScreenlockState::RSSI_TOO_LOW: | 792 case ScreenlockState::RSSI_TOO_LOW: |
793 return PASSWORD_ENTRY_RSSI_TOO_LOW; | 793 return PASSWORD_ENTRY_RSSI_TOO_LOW; |
794 case ScreenlockState::PHONE_LOCKED_AND_RSSI_TOO_LOW: | 794 case ScreenlockState::PHONE_LOCKED_AND_RSSI_TOO_LOW: |
795 return PASSWORD_ENTRY_PHONE_LOCKED_AND_RSSI_TOO_LOW; | 795 return PASSWORD_ENTRY_PHONE_LOCKED_AND_RSSI_TOO_LOW; |
796 case ScreenlockState::AUTHENTICATED: | 796 case ScreenlockState::AUTHENTICATED: |
797 return PASSWORD_ENTRY_WITH_AUTHENTICATED_PHONE; | 797 return PASSWORD_ENTRY_WITH_AUTHENTICATED_PHONE; |
| 798 case ScreenlockState::PASSWORD_REAUTH: |
| 799 return PASSWORD_ENTRY_FORCED_REAUTH; |
798 } | 800 } |
799 } | 801 } |
800 | 802 |
801 NOTREACHED(); | 803 NOTREACHED(); |
802 return EASY_UNLOCK_AUTH_EVENT_COUNT; | 804 return EASY_UNLOCK_AUTH_EVENT_COUNT; |
803 } | 805 } |
804 | 806 |
805 void EasyUnlockService::SetProximityAuthDevices( | 807 void EasyUnlockService::SetProximityAuthDevices( |
806 const AccountId& account_id, | 808 const AccountId& account_id, |
807 const cryptauth::RemoteDeviceList& remote_devices) { | 809 const cryptauth::RemoteDeviceList& remote_devices) { |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
879 | 881 |
880 // TODO(tbarzic): Set check_private_key only if previous sign-in attempt | 882 // TODO(tbarzic): Set check_private_key only if previous sign-in attempt |
881 // failed. | 883 // failed. |
882 EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_) | 884 EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_) |
883 ->PrepareTpmKey(true /* check_private_key */, | 885 ->PrepareTpmKey(true /* check_private_key */, |
884 base::Closure()); | 886 base::Closure()); |
885 #endif // defined(OS_CHROMEOS) | 887 #endif // defined(OS_CHROMEOS) |
886 | 888 |
887 tpm_key_checked_ = true; | 889 tpm_key_checked_ = true; |
888 } | 890 } |
OLD | NEW |