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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 2817933003: Wait for Cryptohome service to be available on login. (Closed)
Patch Set: 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
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/existing_user_controller.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 4847d9a76509e89444c00580d41bceafd12776c0..b85c771644435e1ebaf7363776ff70e6a8fa1d30 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -1238,6 +1238,16 @@ void ExistingUserController::PerformLoginFinishedActions(
StartAutoLoginTimer();
}
+void ExistingUserController::ContinueLoginWhenCryptohomeAvailable(
+ const base::Closure& continuation,
+ bool service_is_available) {
+ if (!service_is_available) {
+ login_display_->SetUIEnabled(true);
xiyuan 2017/04/13 18:07:31 How about do LOG(ERROR) << "Cryptohome service
Sergey Poromov 2017/04/18 12:50:56 Done.
+ return;
+ }
+ continuation.Run();
+}
+
void ExistingUserController::ContinueLoginIfDeviceNotDisabled(
const base::Closure& continuation) {
// Disable clicking on other windows and status tray.
@@ -1283,7 +1293,11 @@ void ExistingUserController::ContinueLoginIfDeviceNotDisabled(
return;
}
- continuation.Run();
+ chromeos::DBusThreadManager::Get()
+ ->GetCryptohomeClient()
+ ->WaitForServiceToBeAvailable(base::Bind(
+ &ExistingUserController::ContinueLoginWhenCryptohomeAvailable,
+ weak_factory_.GetWeakPtr(), continuation));
}
void ExistingUserController::DoCompleteLogin(
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698