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

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

Issue 585213002: [Easy signin] Wire up userClick auth attempt to easy unlock app and back (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@easy_signin_focused_user_changed_observer
Patch Set: fix screenlock private test Created 6 years, 3 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 17bd8fe4e7a53cef845b4f3fc5ca9bb786071eca..243670c2a1651d95b3be3c6de8ddb9538943b6b9 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
@@ -56,8 +56,7 @@ void EasyUnlockKeyManager::RefreshKeys(const UserContext& user_context,
devices,
base::Bind(&EasyUnlockKeyManager::OnKeysCreated,
weak_ptr_factory_.GetWeakPtr(),
- user_context,
- devices,
+ devices.size(),
callback)));
create_keys_op_->Start();
}
@@ -185,8 +184,7 @@ int EasyUnlockKeyManager::GetNextOperationId() {
}
void EasyUnlockKeyManager::OnKeysCreated(
- const UserContext& user_context,
- const EasyUnlockDeviceKeyDataList& devices,
+ size_t remove_start_index,
const RefreshKeysCallback& callback,
bool create_success) {
scoped_ptr<EasyUnlockCreateKeysOperation> op = create_keys_op_.Pass();
@@ -194,7 +192,7 @@ void EasyUnlockKeyManager::OnKeysCreated(
callback.Run(create_success);
// Remove extra existing keys.
- RemoveKeys(user_context, devices.size(), RemoveKeysCallback());
+ RemoveKeys(op->user_context(), remove_start_index, RemoveKeysCallback());
}
void EasyUnlockKeyManager::OnKeysRemoved(const RemoveKeysCallback& callback,

Powered by Google App Engine
This is Rietveld 408576698