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

Unified Diff: chrome/browser/chromeos/login/screens/user_selection_screen.cc

Issue 2563573002: Allow legacy supervised users to login with invalid oath tokens. (Closed)
Patch Set: Created 4 years 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
index 9ebe8f375ad308cc8361b73fae70b83f20036148..7e3b9c150ca1687b86b5cb57cc258b844b9499c9 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -232,13 +232,10 @@ void UserSelectionScreen::FillMultiProfileUserPrefs(
bool UserSelectionScreen::ShouldForceOnlineSignIn(
const user_manager::User* user) {
// Public sessions are always allowed to log in offline.
- // Supervised user are allowed to log in offline if their OAuth token status
- // is unknown or valid.
+ // Supervised users are always allowed to log in offline.
// For all other users, force online sign in if:
// * The flag to force online sign-in is set for the user.
- // * The user's OAuth token is invalid.
- // * The user's OAuth token status is unknown (except supervised users,
- // see above).
+ // * The user's OAuth token is invalid or unknown.
if (user->is_logged_in())
return false;
@@ -249,10 +246,8 @@ bool UserSelectionScreen::ShouldForceOnlineSignIn(
const bool is_public_session =
user->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT;
- if (is_supervised_user &&
- token_status == user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN) {
+ if (is_supervised_user)
return false;
- }
if (is_public_session)
return false;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698