| 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 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 if (!GetAccountId().is_valid()) { | 519 if (!GetAccountId().is_valid()) { |
| 520 LOG(ERROR) << "Empty user account. Refresh token might go bad."; | 520 LOG(ERROR) << "Empty user account. Refresh token might go bad."; |
| 521 if (!callback.is_null()) { | 521 if (!callback.is_null()) { |
| 522 const bool kFailure = false; | 522 const bool kFailure = false; |
| 523 callback.Run(auth_attempt_type, kFailure, account_id, std::string(), | 523 callback.Run(auth_attempt_type, kFailure, account_id, std::string(), |
| 524 std::string()); | 524 std::string()); |
| 525 } | 525 } |
| 526 return; | 526 return; |
| 527 } | 527 } |
| 528 | 528 |
| 529 CHECK(GetAccountId() == account_id) | 529 CHECK(GetAccountId() == account_id); |
| 530 << "Check failed: " << GetAccountId().Serialize() << " vs " | |
| 531 << account_id.Serialize(); | |
| 532 | 530 |
| 533 auth_attempt_.reset(new EasyUnlockAuthAttempt(app_manager_.get(), account_id, | 531 auth_attempt_.reset(new EasyUnlockAuthAttempt(app_manager_.get(), account_id, |
| 534 auth_attempt_type, callback)); | 532 auth_attempt_type, callback)); |
| 535 if (!auth_attempt_->Start()) | 533 if (!auth_attempt_->Start()) |
| 536 auth_attempt_.reset(); | 534 auth_attempt_.reset(); |
| 537 | 535 |
| 538 // TODO(tengs): We notify ProximityAuthSystem whenever unlock attempts are | 536 // TODO(tengs): We notify ProximityAuthSystem whenever unlock attempts are |
| 539 // attempted. However, we ideally should refactor the auth attempt logic to | 537 // attempted. However, we ideally should refactor the auth attempt logic to |
| 540 // the proximity_auth component. | 538 // the proximity_auth component. |
| 541 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 539 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 919 | 917 |
| 920 // 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 |
| 921 // failed. | 919 // failed. |
| 922 EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_) | 920 EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_) |
| 923 ->PrepareTpmKey(true /* check_private_key */, | 921 ->PrepareTpmKey(true /* check_private_key */, |
| 924 base::Closure()); | 922 base::Closure()); |
| 925 #endif // defined(OS_CHROMEOS) | 923 #endif // defined(OS_CHROMEOS) |
| 926 | 924 |
| 927 tpm_key_checked_ = true; | 925 tpm_key_checked_ = true; |
| 928 } | 926 } |
| OLD | NEW |