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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split for FakeManager complete. Created 5 years, 11 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/gaia_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/browser_shutdown.h" 14 #include "chrome/browser/browser_shutdown.h"
15 #include "chrome/browser/chromeos/input_method/input_method_util.h" 15 #include "chrome/browser/chromeos/input_method/input_method_util.h"
16 #include "chrome/browser/chromeos/language_preferences.h" 16 #include "chrome/browser/chromeos/language_preferences.h"
17 #include "chrome/browser/chromeos/login/startup_utils.h" 17 #include "chrome/browser/chromeos/login/startup_utils.h"
18 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 18 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
19 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
19 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 20 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
20 #include "chrome/browser/chromeos/policy/consumer_management_stage.h" 21 #include "chrome/browser/chromeos/policy/consumer_management_stage.h"
21 #include "chrome/browser/chromeos/profiles/profile_helper.h" 22 #include "chrome/browser/chromeos/profiles/profile_helper.h"
22 #include "chrome/browser/chromeos/settings/cros_settings.h" 23 #include "chrome/browser/chromeos/settings/cros_settings.h"
23 #include "chrome/browser/io_thread.h" 24 #include "chrome/browser/io_thread.h"
24 #include "chrome/browser/lifetime/application_lifetime.h" 25 #include "chrome/browser/lifetime/application_lifetime.h"
25 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 26 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
26 #include "chrome/browser/ui/webui/signin/inline_login_ui.h" 27 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
27 #include "chrome/common/chrome_version_info.h" 28 #include "chrome/common/chrome_version_info.h"
28 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 int message_id = -1; 73 int message_id = -1;
73 if (!has_users) { 74 if (!has_users) {
74 supervised_users_can_create = false; 75 supervised_users_can_create = false;
75 message_id = IDS_CREATE_SUPERVISED_USER_NO_MANAGER_TEXT; 76 message_id = IDS_CREATE_SUPERVISED_USER_NO_MANAGER_TEXT;
76 } 77 }
77 if (!allow_new_user || !supervised_users_allowed) { 78 if (!allow_new_user || !supervised_users_allowed) {
78 supervised_users_can_create = false; 79 supervised_users_can_create = false;
79 message_id = IDS_CREATE_SUPERVISED_USER_CREATION_RESTRICTED_TEXT; 80 message_id = IDS_CREATE_SUPERVISED_USER_CREATION_RESTRICTED_TEXT;
80 } 81 }
81 if (supervised_users_can_create && 82 if (supervised_users_can_create &&
82 user_manager::UserManager::Get() 83 chromeos::ChromeUserManager::Get()
Nikita (slow) 2015/01/20 18:18:22 nit: drop chromeos namespace
merkulova 2015/01/21 14:10:34 Done.
83 ->GetUsersAllowedForSupervisedUsersCreation() 84 ->GetUsersAllowedForSupervisedUsersCreation()
84 .empty()) { 85 .empty()) {
85 supervised_users_can_create = false; 86 supervised_users_can_create = false;
86 message_id = IDS_CREATE_SUPERVISED_USER_NO_MANAGER_EXCEPT_KIDS_TEXT; 87 message_id = IDS_CREATE_SUPERVISED_USER_NO_MANAGER_EXCEPT_KIDS_TEXT;
87 } 88 }
88 89
89 params->SetBoolean("supervisedUsersEnabled", supervised_users_allowed); 90 params->SetBoolean("supervisedUsersEnabled", supervised_users_allowed);
90 params->SetBoolean("supervisedUsersCanCreate", supervised_users_can_create); 91 params->SetBoolean("supervisedUsersCanCreate", supervised_users_can_create);
91 if (!supervised_users_can_create) { 92 if (!supervised_users_can_create) {
92 params->SetString("supervisedUsersRestrictionReason", 93 params->SetString("supervisedUsersRestrictionReason",
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 752
752 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 753 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
753 DCHECK(signin_screen_handler_); 754 DCHECK(signin_screen_handler_);
754 return signin_screen_handler_->delegate_; 755 return signin_screen_handler_->delegate_;
755 } 756 }
756 757
757 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { 758 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
758 signin_screen_handler_ = handler; 759 signin_screen_handler_ = handler;
759 } 760 }
760 } // namespace chromeos 761 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698