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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc ('K') | « chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc » ('j') | chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index 3fa96213334c04fd753add6cc344a76858ccae93..6477d1e9b0bfb8c673d9c8cbb34e222a5abe6874 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/chromeos/language_preferences.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
#include "chrome/browser/chromeos/policy/consumer_management_service.h"
#include "chrome/browser/chromeos/policy/consumer_management_stage.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -79,7 +80,7 @@ void UpdateAuthParams(base::DictionaryValue* params,
message_id = IDS_CREATE_SUPERVISED_USER_CREATION_RESTRICTED_TEXT;
}
if (supervised_users_can_create &&
- user_manager::UserManager::Get()
+ chromeos::ChromeUserManager::Get()
Nikita (slow) 2015/01/20 18:18:22 nit: drop chromeos namespace
merkulova 2015/01/21 14:10:34 Done.
->GetUsersAllowedForSupervisedUsersCreation()
.empty()) {
supervised_users_can_create = false;
« chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc ('K') | « chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc » ('j') | chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698