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

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

Issue 228553002: Preference dis/allowing supervised users creation is now available as owner setting, not only as de… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/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 08eb483255d7040c32169d6121d2642147a2169a..bc37caeaee2a3dae0d9848bb286e3a4f5f5c2277 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -160,6 +160,10 @@ ExistingUserController::ExistingUserController(LoginDisplayHost* host)
kAccountsPrefAllowGuest,
base::Bind(&ExistingUserController::DeviceSettingsChanged,
base::Unretained(this)));
+ allow_supervised_user_subscription_ = cros_settings_->AddSettingsObserver(
+ kAccountsPrefSupervisedUsersEnabled,
+ base::Bind(&ExistingUserController::DeviceSettingsChanged,
+ base::Unretained(this)));
users_subscription_ = cros_settings_->AddSettingsObserver(
kAccountsPrefUsers,
base::Bind(&ExistingUserController::DeviceSettingsChanged,
@@ -211,8 +215,12 @@ void ExistingUserController::UpdateLoginDisplay(const UserList& users) {
cros_settings_->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_users);
show_guest &= !filtered_users.empty();
bool show_new_user = true;
+ bool show_supervised;
+ cros_settings_->GetBoolean(kAccountsPrefSupervisedUsersEnabled,
+ &show_supervised);
login_display_->set_parent_window(GetNativeWindow());
- login_display_->Init(filtered_users, show_guest, show_users, show_new_user);
+ login_display_->Init(
+ filtered_users, show_guest, show_supervised, show_users, show_new_user);
host_->OnPreferencesChanged();
}

Powered by Google App Engine
This is Rietveld 408576698