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

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

Issue 298193002: Revert of ChromeOS login webui refactoring: split user selection/gaia login screens. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | « no previous file | chrome/browser/chromeos/login/existing_user_controller_browsertest.cc » ('j') | 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 4136acdebfccd6fab1f2807d985d7d758eb53554..4922576831d529f308881db30214f6a21ef0dad4 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -609,6 +609,7 @@
void ExistingUserController::ShowWrongHWIDScreen() {
scoped_ptr<base::DictionaryValue> params;
host_->StartWizard(WizardController::kWrongHWIDScreenName, params.Pass());
+ login_display_->OnFadeOut();
}
void ExistingUserController::Signout() {
@@ -653,22 +654,26 @@
}
host_->StartWizard(WizardController::kEnrollmentScreenName,
params.Pass());
+ login_display_->OnFadeOut();
}
void ExistingUserController::ShowResetScreen() {
scoped_ptr<base::DictionaryValue> params;
host_->StartWizard(WizardController::kResetScreenName, params.Pass());
+ login_display_->OnFadeOut();
}
void ExistingUserController::ShowKioskEnableScreen() {
scoped_ptr<base::DictionaryValue> params;
host_->StartWizard(WizardController::kKioskEnableScreenName, params.Pass());
+ login_display_->OnFadeOut();
}
void ExistingUserController::ShowKioskAutolaunchScreen() {
scoped_ptr<base::DictionaryValue> params;
host_->StartWizard(WizardController::kKioskAutolaunchScreenName,
params.Pass());
+ login_display_->OnFadeOut();
}
void ExistingUserController::ShowTPMError() {
@@ -779,6 +784,9 @@
this);
display_email_.clear();
+
+ // Notify LoginDisplay to allow it provide visual feedback to user.
+ login_display_->OnLoginSuccess(user_context.GetUserID());
}
void ExistingUserController::OnProfilePrepared(Profile* profile) {
@@ -819,6 +827,7 @@
// Inform |login_status_consumer_| about successful login.
if (login_status_consumer_)
login_status_consumer_->OnLoginSuccess(UserContext());
+ login_display_->OnFadeOut();
}
void ExistingUserController::OnOffTheRecordLoginSuccess() {
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698