Index: chrome/browser/chromeos/login/users/user_manager_impl.cc |
diff --git a/chrome/browser/chromeos/login/users/user_manager_impl.cc b/chrome/browser/chromeos/login/users/user_manager_impl.cc |
index 5d79f0f1eb3a366f27d758de7f3152abcff7e82d..576ca3d5ba350ad7e8586eda57494017d33019e8 100644 |
--- a/chrome/browser/chromeos/login/users/user_manager_impl.cc |
+++ b/chrome/browser/chromeos/login/users/user_manager_impl.cc |
@@ -235,10 +235,6 @@ UserManagerImpl::UserManagerImpl() |
kAccountsPrefDeviceLocalAccounts, |
base::Bind(&UserManagerImpl::RetrieveTrustedDevicePolicies, |
base::Unretained(this))); |
- supervised_users_subscription_ = cros_settings_->AddSettingsObserver( |
- kAccountsPrefSupervisedUsersEnabled, |
- base::Bind(&UserManagerImpl::RetrieveTrustedDevicePolicies, |
- base::Unretained(this))); |
multi_profile_user_controller_.reset(new MultiProfileUserController( |
this, g_browser_process->local_state())); |
@@ -279,7 +275,6 @@ UserManagerImpl::~UserManagerImpl() { |
void UserManagerImpl::Shutdown() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
local_accounts_subscription_.reset(); |
- supervised_users_subscription_.reset(); |
// Stop the session length limiter. |
session_length_limiter_.reset(); |
@@ -1876,9 +1871,7 @@ bool UserManagerImpl::AreLocallyManagedUsersAllowed() const { |
bool locally_managed_users_allowed = false; |
cros_settings_->GetBoolean(kAccountsPrefSupervisedUsersEnabled, |
&locally_managed_users_allowed); |
- policy::BrowserPolicyConnectorChromeOS* connector = |
- g_browser_process->platform_part()->browser_policy_connector_chromeos(); |
- return locally_managed_users_allowed || !connector->IsEnterpriseManaged(); |
+ return locally_managed_users_allowed; |
} |
base::FilePath UserManagerImpl::GetUserProfileDir( |