diff options
| author | tbarzic <tbarzic@chromium.org> | 2014-10-23 12:44:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-23 19:44:34 +0000 |
| commit | 71a0f5957776e67b67a68e87601d77d8841ca009 (patch) | |
| tree | ecfa76d9ebf2558ed296fc1e4aa96aadb2433e4f /chromeos/login | |
| parent | 0ee9126c15e2c0ec18a9cc9b6522133e45946db2 (diff) | |
| download | chromium_src-71a0f5957776e67b67a68e87601d77d8841ca009.zip chromium_src-71a0f5957776e67b67a68e87601d77d8841ca009.tar.gz chromium_src-71a0f5957776e67b67a68e87601d77d8841ca009.tar.bz2 | |
Improve handling of easy unlock failures.
Mainly, show a suitable error message, and make sure the screen lock does not
remain in authenticated easy-unlock state.
BUG=417567
Review URL: https://codereview.chromium.org/661003004
Cr-Commit-Position: refs/heads/master@{#300930}
Diffstat (limited to 'chromeos/login')
| -rw-r--r-- | chromeos/login/auth/login_performer.cc | 4 | ||||
| -rw-r--r-- | chromeos/login/auth/login_performer.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/chromeos/login/auth/login_performer.cc b/chromeos/login/auth/login_performer.cc index 823036f..960a69e 100644 --- a/chromeos/login/auth/login_performer.cc +++ b/chromeos/login/auth/login_performer.cc @@ -153,6 +153,10 @@ void LoginPerformer::DoPerformLogin(const UserContext& user_context, NotifyWhitelistCheckFailure(); return; } + + if (user_context.GetAuthFlow() == UserContext::AUTH_FLOW_EASY_UNLOCK) + SetupEasyUnlockUserFlow(user_context.GetUserID()); + switch (auth_mode_) { case AUTH_MODE_EXTENSION: { RunOnlineWhitelistCheck( diff --git a/chromeos/login/auth/login_performer.h b/chromeos/login/auth/login_performer.h index 318fc4a..e924a73 100644 --- a/chromeos/login/auth/login_performer.h +++ b/chromeos/login/auth/login_performer.h @@ -162,6 +162,9 @@ class CHROMEOS_EXPORT LoginPerformer : public AuthStatusConsumer, // Set up sign-in flow for supervised user. virtual void SetupSupervisedUserFlow(const std::string& user_id) = 0; + // Set up sign-in flow for Easy Unlock. + virtual void SetupEasyUnlockUserFlow(const std::string& user_id) = 0; + // Run policy check for |user_id|. If something is wrong, delegate's // PolicyLoadFailed is called. virtual bool CheckPolicyForUser(const std::string& user_id) = 0; |