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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 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
Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 851b261f14849bf2fbeeb04d420f72f02e6ca2f5..c8c3d91e6f33e09b282d9ec3d62f34a46ab67662 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -873,7 +873,7 @@ void SigninScreenHandler::ShowUserPodCustomIcon(
// TODO(tengs): Move this code once we move unlocking to native code.
if (ScreenLocker::default_screen_locker()) {
- UserManager* user_manager = UserManager::Get();
+ UserManager* user_manager = GetUserManager();
const User* user = user_manager->FindUser(username);
if (!user)
return;
@@ -927,7 +927,7 @@ bool SigninScreenHandler::ShouldLoadGaia() const {
// Update keyboard layout to least recently used by the user.
void SigninScreenHandler::SetUserInputMethod(const std::string& username) {
- UserManager* user_manager = UserManager::Get();
+ UserManager* user_manager = GetUserManager();
if (user_manager->IsUserLoggedIn()) {
// We are on sign-in screen inside user session (adding new user to
// the session or on lock screen), don't switch input methods in this case.
@@ -1010,7 +1010,7 @@ void SigninScreenHandler::HandleLaunchIncognito() {
}
void SigninScreenHandler::HandleShowLocallyManagedUserCreationScreen() {
- if (!UserManager::Get()->AreLocallyManagedUsersAllowed()) {
+ if (!GetUserManager()->AreLocallyManagedUsersAllowed()) {
LOG(ERROR) << "Managed users not allowed.";
return;
}
@@ -1231,7 +1231,7 @@ void SigninScreenHandler::HandleLoginUIStateChanged(const std::string& source,
}
void SigninScreenHandler::HandleUnlockOnLoginSuccess() {
- DCHECK(UserManager::Get()->IsUserLoggedIn());
+ DCHECK(GetUserManager()->IsUserLoggedIn());
if (ScreenLocker::default_screen_locker())
ScreenLocker::default_screen_locker()->UnlockOnLoginSuccess();
}
@@ -1275,7 +1275,7 @@ bool SigninScreenHandler::AllWhitelistedUsersPresent() {
cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
if (allow_new_user)
return false;
- UserManager* user_manager = UserManager::Get();
+ UserManager* user_manager = GetUserManager();
const UserList& users = user_manager->GetUsers();
if (!delegate_ || users.size() > kMaxUsers) {
return false;

Powered by Google App Engine
This is Rietveld 408576698