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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 17546004: Added policy for disabling locally managed users. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge conflict resolved. Created 7 years, 6 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/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 22030d21623a04b442554d7852a8513cdb5731bb..ae696d8d26ca1123d226946332a47cbc874fea13 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"
@@ -1005,11 +1004,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();
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);
}
@@ -1128,8 +1128,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());
« no previous file with comments | « chrome/browser/policy/proto/chromeos/chrome_device_policy.proto ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698