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

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

Issue 14028005: Update locally managed user creation flow according to mocks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with TOT Created 7 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 5adfeca28c36b045a41178637ec0e84bfc2c228d..45d2123678addae12cdba5de20aecb02c868da8a 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
@@ -24,13 +24,10 @@ LocallyManagedUserCreationScreen* GetScreen(LoginDisplayHost* host) {
} // namespace
LocallyManagedUserCreationFlow::LocallyManagedUserCreationFlow(
- const std::string& manager_id,
- string16 name,
- const std::string& password) : ExtendedUserFlow(manager_id),
- name_(name),
- password_(password),
- token_validated_(false),
- logged_in_(false) {}
+ const std::string& manager_id)
+ : ExtendedUserFlow(manager_id),
+ token_validated_(false),
+ logged_in_(false) {}
LocallyManagedUserCreationFlow::~LocallyManagedUserCreationFlow() {}
@@ -56,7 +53,7 @@ void LocallyManagedUserCreationFlow::HandleOAuthTokenStatusChange(
token_validated_ = true;
if (token_validated_ && logged_in_)
- GetScreen(host())->OnManagerSignIn();
+ GetScreen(host())->OnManagerFullyAuthenticated();
}
@@ -76,10 +73,11 @@ bool LocallyManagedUserCreationFlow::HandlePasswordChangeDetected() {
void LocallyManagedUserCreationFlow::LaunchExtraSteps(
Profile* profile) {
-
logged_in_ = true;
if (token_validated_ && logged_in_)
- GetScreen(host())->OnManagerSignIn();
+ GetScreen(host())->OnManagerFullyAuthenticated();
+ else
+ GetScreen(host())->OnManagerCryptohomeAuthenticated();
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698