Chromium Code Reviews| Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc |
| diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc |
| index e135e36b99f6eceaeb5641f09bd7f3a5bbd22364..1c66c12325f8415c1540c5d8c2a96a2d35d143e7 100644 |
| --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc |
| +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc |
| @@ -29,7 +29,6 @@ |
| #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| #include "chrome/browser/chromeos/settings/cros_settings.h" |
| #include "chrome/browser/io_thread.h" |
| -#include "chrome/browser/managed_mode/managed_user_service.h" |
| #include "chrome/browser/policy/browser_policy_connector.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" |
| @@ -1004,11 +1003,12 @@ void SigninScreenHandler::UpdateAuthParams(DictionaryValue* params) { |
| // bool single_user = users.size() == 1; |
| // chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner); |
| - bool managed_users_enabled = ManagedUserService::AreManagedUsersEnabled(); |
| + bool managed_users_allowed = |
| + UserManager::Get()->AreLocallyManagedUsersAllowed(); |
|
Mattias Nissler (ping if slow)
2013/06/21 14:25:16
nit: indentation
dzhioev (left Google)
2013/06/21 16:48:17
Done.
|
| bool managed_users_can_create = false; |
| - if (managed_users_enabled) |
| + if (managed_users_allowed) |
| managed_users_can_create = delegate_->GetUsers().size() > 0; |
| - params->SetBoolean("managedUsersEnabled", managed_users_enabled); |
| + params->SetBoolean("managedUsersEnabled", managed_users_allowed); |
| params->SetBoolean("managedUsersCanCreate", managed_users_can_create); |
| } |
| @@ -1127,8 +1127,8 @@ void SigninScreenHandler::HandleLaunchIncognito() { |
| } |
| void SigninScreenHandler::HandleShowLocallyManagedUserCreationScreen() { |
| - if (!ManagedUserService::AreManagedUsersEnabled()) { |
| - LOG(ERROR) << "Managed users disabled."; |
| + if (!UserManager::Get()->AreLocallyManagedUsersAllowed()) { |
| + LOG(ERROR) << "Managed users not allowed."; |
| return; |
| } |
| scoped_ptr<DictionaryValue> params(new DictionaryValue()); |