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

Unified Diff: chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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/chromeos/login/saml/saml_offline_signin_limiter.cc
diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc
index 892298126764cf4c8593b775b4183d66b197c340..42321e3a084c03758c6dda650f96e022d9b412b5 100644
--- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc
+++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc
@@ -13,12 +13,12 @@
#include "base/prefs/pref_service.h"
#include "base/time/clock.h"
#include "base/time/time.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/user_manager/user.h"
+#include "components/user_manager/user_manager.h"
namespace chromeos {
@@ -56,7 +56,7 @@ void SAMLOfflineSigninLimiter::SignedIn(UserContext::AuthFlow auth_flow) {
// a SAML IdP. No limit applies in this case. Clear the time of last login
// with SAML and the flag enforcing online login, then return.
prefs->ClearPref(prefs::kSAMLLastGAIASignInTime);
- UserManager::Get()->SaveForceOnlineSignin(user_id, false);
+ user_manager::UserManager::Get()->SaveForceOnlineSignin(user_id, false);
return;
}
@@ -66,7 +66,7 @@ void SAMLOfflineSigninLimiter::SignedIn(UserContext::AuthFlow auth_flow) {
// enforcing online login. The flag will be set again when the limit
// expires. If the limit already expired (e.g. because it was set to zero),
// the flag will be set again immediately.
- UserManager::Get()->SaveForceOnlineSignin(user_id, false);
+ user_manager::UserManager::Get()->SaveForceOnlineSignin(user_id, false);
prefs->SetInt64(prefs::kSAMLLastGAIASignInTime,
clock_->Now().ToInternalValue());
}
@@ -147,7 +147,7 @@ void SAMLOfflineSigninLimiter::ForceOnlineLogin() {
return;
}
- UserManager::Get()->SaveForceOnlineSignin(user->email(), true);
+ user_manager::UserManager::Get()->SaveForceOnlineSignin(user->email(), true);
offline_signin_limit_timer_.reset();
}

Powered by Google App Engine
This is Rietveld 408576698