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

chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "ash/multi_profile_uma.h"
@@ skipping 212 matching lines @@
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
       content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_PROFILE_CREATED,
                  content::NotificationService::AllSources());
   RetrieveTrustedDevicePolicies();
   local_accounts_subscription_ = cros_settings_->AddSettingsObserver(
       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()));
 
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   avatar_policy_observer_.reset(new policy::CloudExternalDataPolicyObserver(
       cros_settings_,
       this,
       connector->GetDeviceLocalAccountPolicyService(),
       policy::key::kUserAvatarImage,
@@ skipping 1587 matching lines @@
     const std::string& chrome_client_secret) {
   if (!chrome::IsRunningInForcedAppMode())
     return;
 
   chrome_client_id_ = chrome_client_id;
   chrome_client_secret_ = chrome_client_secret;
 }
 
 bool UserManagerImpl::AreLocallyManagedUsersAllowed() const {
   bool locally_managed_users_allowed = false;
+  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();
+  // 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);
-  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(
     const std::string& user_id) const {
   // TODO(dpolukhin): Remove Chrome OS specific profile path logic from
   // ProfileManager and use only this function to construct profile path.
   // TODO(nkostylev): Cleanup profile dir related code paths crbug.com/294233
   base::FilePath profile_dir;
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(::switches::kMultiProfiles)) {
@@ skipping 225 matching lines @@
 }
 
 void UserManagerImpl::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = NULL;
 }
 
 }  // namespace chromeos