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

Unified Diff: chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.cc

Issue 256223003: Supervised users import: make sure users are up-to-date. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes Created 6 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/managed/locally_managed_user_creation_flow.cc
diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.cc b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.cc
index 10a3403ec94709c0e87fbd28817603dfdfbf35a8..83a5cd5e11b05660f0136c5833b66d96f23abb79 100644
--- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.cc
+++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.cc
@@ -30,6 +30,7 @@ LocallyManagedUserCreationFlow::LocallyManagedUserCreationFlow(
: ExtendedUserFlow(manager_id),
token_validated_(false),
logged_in_(false),
+ session_started_(false),
manager_profile_(NULL) {}
LocallyManagedUserCreationFlow::~LocallyManagedUserCreationFlow() {}
@@ -63,8 +64,11 @@ void LocallyManagedUserCreationFlow::HandleOAuthTokenStatusChange(
// authentication happens before oauth token validation).
token_validated_ = true;
- if (token_validated_ && logged_in_)
- GetScreen(host())->OnManagerFullyAuthenticated(manager_profile_);
+ if (token_validated_ && logged_in_) {
+ if (!session_started_)
+ GetScreen(host())->OnManagerFullyAuthenticated(manager_profile_);
+ session_started_ = true;
+ }
}
@@ -93,10 +97,13 @@ void LocallyManagedUserCreationFlow::LaunchExtraSteps(
profile,
true);
- if (token_validated_ && logged_in_)
- GetScreen(host())->OnManagerFullyAuthenticated(manager_profile_);
- else
+ if (token_validated_ && logged_in_) {
+ if (!session_started_)
+ GetScreen(host())->OnManagerFullyAuthenticated(manager_profile_);
+ session_started_ = true;
+ } else {
GetScreen(host())->OnManagerCryptohomeAuthenticated();
+ }
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698