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

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

Issue 14306004: Put Kiosk App parameters into device settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. 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/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 cd4ea04dee5e813245d01d867a59fe7ab4be9ccf..a412823687d8bdca800e1e1b0ffedec7f64e3999 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -261,6 +261,7 @@ void ExistingUserController::Observe(
if (host_ != NULL) {
// Signed settings or user list changed. Notify views and update them.
UpdateLoginDisplay(chromeos::UserManager::Get()->GetUsers());
+ ConfigurePublicSessionAutoLogin();
return;
}
}
@@ -915,6 +916,12 @@ void ExistingUserController::ConfigurePublicSessionAutoLogin() {
&public_session_auto_login_username_)) {
public_session_auto_login_username_.clear();
}
+
+ const User* user =
+ UserManager::Get()->FindUser(public_session_auto_login_username_);
+ if (!user || user->GetType() != User::USER_TYPE_PUBLIC_ACCOUNT)
+ public_session_auto_login_username_.clear();
+
if (!cros_settings_->GetInteger(
kAccountsPrefDeviceLocalAccountAutoLoginDelay,
&public_session_auto_login_delay_)) {

Powered by Google App Engine
This is Rietveld 408576698