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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 11 matching lines...) Expand all
22 #include "chrome/browser/chromeos/login/hwid_checker.h" 22 #include "chrome/browser/chromeos/login/hwid_checker.h"
23 #include "chrome/browser/chromeos/login/login_display_host_impl.h" 23 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
24 #include "chrome/browser/chromeos/login/screen_locker.h" 24 #include "chrome/browser/chromeos/login/screen_locker.h"
25 #include "chrome/browser/chromeos/login/user.h" 25 #include "chrome/browser/chromeos/login/user.h"
26 #include "chrome/browser/chromeos/login/webui_login_display.h" 26 #include "chrome/browser/chromeos/login/webui_login_display.h"
27 #include "chrome/browser/chromeos/login/wizard_controller.h" 27 #include "chrome/browser/chromeos/login/wizard_controller.h"
28 #include "chrome/browser/chromeos/net/network_portal_detector.h" 28 #include "chrome/browser/chromeos/net/network_portal_detector.h"
29 #include "chrome/browser/chromeos/profiles/profile_helper.h" 29 #include "chrome/browser/chromeos/profiles/profile_helper.h"
30 #include "chrome/browser/chromeos/settings/cros_settings.h" 30 #include "chrome/browser/chromeos/settings/cros_settings.h"
31 #include "chrome/browser/io_thread.h" 31 #include "chrome/browser/io_thread.h"
32 #include "chrome/browser/managed_mode/managed_user_service.h"
33 #include "chrome/browser/policy/browser_policy_connector.h" 32 #include "chrome/browser/policy/browser_policy_connector.h"
34 #include "chrome/browser/profiles/profile.h" 33 #include "chrome/browser/profiles/profile.h"
35 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" 34 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
36 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" 35 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
37 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 36 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
38 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 37 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
39 #include "chrome/common/chrome_notification_types.h" 38 #include "chrome/common/chrome_notification_types.h"
40 #include "chrome/common/chrome_switches.h" 39 #include "chrome/common/chrome_switches.h"
41 #include "chrome/common/pref_names.h" 40 #include "chrome/common/pref_names.h"
42 #include "chrome/common/url_constants.h" 41 #include "chrome/common/url_constants.h"
(...skipping 955 matching lines...) Expand 10 before | Expand all | Expand 10 after
998 UpdateAuthParamsFromSettings(params, CrosSettings::Get()); 997 UpdateAuthParamsFromSettings(params, CrosSettings::Get());
999 998
1000 // TODO(nkostylev): Allow locally managed user creation only if: 999 // TODO(nkostylev): Allow locally managed user creation only if:
1001 // 1. Enterprise managed device > is allowed by policy. 1000 // 1. Enterprise managed device > is allowed by policy.
1002 // 2. Consumer device > owner exists. 1001 // 2. Consumer device > owner exists.
1003 // g_browser_process->browser_policy_connector()->IsEnterpriseManaged() 1002 // g_browser_process->browser_policy_connector()->IsEnterpriseManaged()
1004 // const UserList& users = delegate_->GetUsers(); 1003 // const UserList& users = delegate_->GetUsers();
1005 // bool single_user = users.size() == 1; 1004 // bool single_user = users.size() == 1;
1006 // chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner); 1005 // chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
1007 1006
1008 bool managed_users_enabled = ManagedUserService::AreManagedUsersEnabled(); 1007 bool managed_users_allowed =
1008 UserManager::Get()->AreLocallyManagedUsersAllowed();
1009 bool managed_users_can_create = false; 1009 bool managed_users_can_create = false;
1010 if (managed_users_enabled) 1010 if (managed_users_allowed)
1011 managed_users_can_create = delegate_->GetUsers().size() > 0; 1011 managed_users_can_create = delegate_->GetUsers().size() > 0;
1012 params->SetBoolean("managedUsersEnabled", managed_users_enabled); 1012 params->SetBoolean("managedUsersEnabled", managed_users_allowed);
1013 params->SetBoolean("managedUsersCanCreate", managed_users_can_create); 1013 params->SetBoolean("managedUsersCanCreate", managed_users_can_create);
1014 } 1014 }
1015 1015
1016 void SigninScreenHandler::LoadAuthExtension( 1016 void SigninScreenHandler::LoadAuthExtension(
1017 bool force, bool silent_load, bool offline) { 1017 bool force, bool silent_load, bool offline) {
1018 DictionaryValue params; 1018 DictionaryValue params;
1019 1019
1020 params.SetBoolean("forceReload", force); 1020 params.SetBoolean("forceReload", force);
1021 params.SetBoolean("silentLoad", silent_load); 1021 params.SetBoolean("silentLoad", silent_load);
1022 params.SetBoolean("isLocal", offline); 1022 params.SetBoolean("isLocal", offline);
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
1121 if (delegate_) 1121 if (delegate_)
1122 delegate_->LoginAsRetailModeUser(); 1122 delegate_->LoginAsRetailModeUser();
1123 } 1123 }
1124 1124
1125 void SigninScreenHandler::HandleLaunchIncognito() { 1125 void SigninScreenHandler::HandleLaunchIncognito() {
1126 if (delegate_) 1126 if (delegate_)
1127 delegate_->LoginAsGuest(); 1127 delegate_->LoginAsGuest();
1128 } 1128 }
1129 1129
1130 void SigninScreenHandler::HandleShowLocallyManagedUserCreationScreen() { 1130 void SigninScreenHandler::HandleShowLocallyManagedUserCreationScreen() {
1131 if (!ManagedUserService::AreManagedUsersEnabled()) { 1131 if (!UserManager::Get()->AreLocallyManagedUsersAllowed()) {
1132 LOG(ERROR) << "Managed users disabled."; 1132 LOG(ERROR) << "Managed users not allowed.";
1133 return; 1133 return;
1134 } 1134 }
1135 scoped_ptr<DictionaryValue> params(new DictionaryValue()); 1135 scoped_ptr<DictionaryValue> params(new DictionaryValue());
1136 LoginDisplayHostImpl::default_host()-> 1136 LoginDisplayHostImpl::default_host()->
1137 StartWizard(WizardController::kLocallyManagedUserCreationScreenName, 1137 StartWizard(WizardController::kLocallyManagedUserCreationScreenName,
1138 params.Pass()); 1138 params.Pass());
1139 } 1139 }
1140 1140
1141 void SigninScreenHandler::HandleLaunchPublicAccount( 1141 void SigninScreenHandler::HandleLaunchPublicAccount(
1142 const std::string& username) { 1142 const std::string& username) {
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
1645 if (!cros_settings) 1645 if (!cros_settings)
1646 return false; 1646 return false;
1647 1647
1648 // Offline login is allowed only when user pods are hidden. 1648 // Offline login is allowed only when user pods are hidden.
1649 bool show_pods; 1649 bool show_pods;
1650 cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods); 1650 cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods);
1651 return !show_pods; 1651 return !show_pods;
1652 } 1652 }
1653 1653
1654 } // namespace chromeos 1654 } // namespace chromeos
OLDNEW
« 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