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

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

Issue 12088040: Add a SigninAllowed policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT, another try to upload. 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
Index: chrome/browser/signin/signin_tracker.cc
diff --git a/chrome/browser/signin/signin_tracker.cc b/chrome/browser/signin/signin_tracker.cc
index 689717b8a6222eb7a8c0b47d6858fc1be4681ba6..deeb222101485443979c4b409fcdca8e7b7dd76e 100644
--- a/chrome/browser/signin/signin_tracker.cc
+++ b/chrome/browser/signin/signin_tracker.cc
@@ -134,7 +134,8 @@ void SigninTracker::HandleServiceStateChange() {
}
SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
- if (signin->GetAuthenticatedUsername().empty()) {
+ if (signin->GetAuthenticatedUsername().empty() ||
+ !signin->IsSigninAllowed()) {
// User is signed out, trigger a signin failure.
state_ = WAITING_FOR_GAIA_VALIDATION;
observer_->SigninFailed(
@@ -146,8 +147,9 @@ void SigninTracker::HandleServiceStateChange() {
// Long term, we should separate out service auth failures from the signin
// process, but for the current UI flow we'll validate service signin status
// also.
- ProfileSyncService* service = profile_->IsSyncAccessible() ?
- ProfileSyncServiceFactory::GetForProfile(profile_) : NULL;
+ ProfileSyncService* service =
+ profile_->IsSyncAccessible() ?
+ ProfileSyncServiceFactory::GetForProfile(profile_) : NULL;
if (service && service->waiting_for_auth()) {
// Still waiting for an auth token to come in so stay in the INITIALIZING
// state (we do this to avoid triggering an early signin error in the case

Powered by Google App Engine
This is Rietveld 408576698