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

Unified Diff: chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.cc

Issue 2847233003: [EasyUnlock] Move DataWithTimestamp out of ForegroundEidGenerator so it can be shared. (Closed)
Patch Set: fixes Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.cc
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.cc
index 94a5e8957b10df57231bcdc59fea14c2f896dc16..d6479a613938f5deed7c0287b4f248b1d68b18ad 100644
--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.cc
+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.cc
@@ -65,6 +65,7 @@ void EasyUnlockKeyManager::RefreshKeys(const UserContext& user_context,
if (remote_devices.empty() ||
tpm_key_manager->PrepareTpmKey(false /* check_private_key */,
do_refresh_keys)) {
+ PA_LOG(WARNING) << "Refreshing keys...";
do_refresh_keys.Run();
} else {
// In case Chrome is supposed to restart to apply user session flags, the
@@ -73,6 +74,7 @@ void EasyUnlockKeyManager::RefreshKeys(const UserContext& user_context,
// loading takes too much time. Note that in normal circumstances the
// chances that TPM slot cannot be loaded should be extremely low.
// TODO(tbarzic): Add some metrics to measure if the timeout even gets hit.
+ PA_LOG(WARNING) << "Refresh keys after loading TPM...";
tpm_key_manager->StartGetSystemSlotTimeoutMs(2000);
}
}
@@ -87,9 +89,13 @@ void EasyUnlockKeyManager::RefreshKeysWithTpmKeyPresent(
const std::string tpm_public_key =
tpm_key_manager->GetPublicTpmKey(user_context.GetAccountId());
+ PA_LOG(WARNING) << "Refreshing keys: " << remote_devices;
+
EasyUnlockDeviceKeyDataList devices;
- if (!RemoteDeviceListToDeviceDataList(*remote_devices, &devices))
+ if (!RemoteDeviceListToDeviceDataList(*remote_devices, &devices)) {
+ PA_LOG(ERROR) << "ERROR Coverting remote devices";
devices.clear();
+ }
write_operation_queue_.push_back(
base::MakeUnique<EasyUnlockRefreshKeysOperation>(

Powered by Google App Engine
This is Rietveld 408576698