Preference dis/allowing supervised users creation is now available as owner setting, not only as de…

chrome/browser/chromeos/login/user_manager_impl.cc

Index: chrome/browser/chromeos/login/user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
index 0d5f14b44ad5c684fad1c2b1b8642a8b55630ae0..8025448f7f755e77775024010f85cc8e501c6f18 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -230,10 +230,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()));
 
@@ -1841,11 +1837,15 @@ void UserManagerImpl::SetAppModeChromeClientOAuthInfo(
 
 bool UserManagerImpl::AreLocallyManagedUsersAllowed() const {
   bool locally_managed_users_allowed = false;
-  cros_settings_->GetBoolean(kAccountsPrefSupervisedUsersEnabled,
-                             &locally_managed_users_allowed);
   policy::BrowserPolicyConnectorChromeOS* connector =

[Nikita (slow), 2014/04/14 11:48:59]

nit: As discussed, please remove lines 1840..1845 since these defaults will be
set in device_settings_provider.cc

[merkulova, 2014/04/14 12:14:47]

Done.

       g_browser_process->platform_part()->browser_policy_connector_chromeos();
-  return locally_managed_users_allowed || !connector->IsEnterpriseManaged();
+  // For enterprise device supervised users are not allowed by default,
+  // for consumer devices supervised users are enabled by default.
+  if (!connector->IsEnterpriseManaged())
+    locally_managed_users_allowed = true;
+  cros_settings_->GetBoolean(kAccountsPrefSupervisedUsersEnabled,
+                             &locally_managed_users_allowed);
+  return locally_managed_users_allowed;
 }
 
 base::FilePath UserManagerImpl::GetUserProfileDir(