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

Unified Diff: chrome/browser/signin/signin_manager.cc

Issue 12088040: Add a SigninAllowed policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nits and rebase to ToT. Created 7 years, 10 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
« no previous file with comments | « chrome/browser/signin/signin_manager.h ('k') | chrome/browser/signin/signin_manager_fake.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/signin_manager.cc
diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc
index 92dc661587c19bf40f56a0df0524eafa40427e41..2bb48def7d9252d0db15bf5b1b6a82f57dad328e 100644
--- a/chrome/browser/signin/signin_manager.cc
+++ b/chrome/browser/signin/signin_manager.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings.h"
#include "chrome/browser/profiles/profile_info_cache.h"
+#include "chrome/browser/profiles/profile_io_data.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/signin/about_signin_internals.h"
#include "chrome/browser/signin/about_signin_internals_factory.h"
@@ -223,6 +224,9 @@ void SigninManager::Initialize(Profile* profile) {
base::Bind(&SigninManager::OnGoogleServicesUsernamePatternChanged,
weak_pointer_factory_.GetWeakPtr()));
}
+ signin_allowed_.Init(prefs::kSigninAllowed, profile_->GetPrefs(),
+ base::Bind(&SigninManager::OnSigninAllowedPrefChanged,
+ base::Unretained(this)));
// If the user is clearing the token service from the command line, then
// clear their login info also (not valid to be logged in without any
@@ -249,7 +253,7 @@ void SigninManager::Initialize(Profile* profile) {
}
#endif
}
- if (!user.empty() && !IsAllowedUsername(user)) {
+ if ((!user.empty() && !IsAllowedUsername(user)) || !IsSigninAllowed()) {
// User is signed in, but the username is invalid - the administrator must
// have changed the policy since the last signin, so sign out the user.
SignOut();
@@ -270,6 +274,16 @@ bool SigninManager::IsAllowedUsername(const std::string& username) const {
return IsAllowedUsername(username, pattern);
}
+bool SigninManager::IsSigninAllowed() const {
+ return signin_allowed_.GetValue();
+}
+
+// static
+bool SigninManager::IsSigninAllowedOnIOThread(ProfileIOData* io_data) {
+ DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+ return io_data->signin_allowed()->GetValue();
+}
+
void SigninManager::CleanupNotificationRegistration() {
#if !defined(OS_CHROMEOS)
content::Source<TokenService> token_service(
@@ -916,6 +930,11 @@ void SigninManager::OnGoogleServicesUsernamePatternChanged() {
}
}
+void SigninManager::OnSigninAllowedPrefChanged() {
+ if (!IsSigninAllowed())
+ SignOut();
+}
+
void SigninManager::AddSigninDiagnosticsObserver(
SigninDiagnosticsObserver* observer) {
signin_diagnostics_observers_.AddObserver(observer);
« no previous file with comments | « chrome/browser/signin/signin_manager.h ('k') | chrome/browser/signin/signin_manager_fake.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698