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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 2314913003: Deprecate HOSTED_NOT_ALLOWED auth error (Closed)
Patch Set: Replace NUM_DEPRECATED_STATES with IsDeprecated() Created 4 years, 3 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/existing_user_controller.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 590b4182be383b901a7861d70a2ad4d9ad84020b..5397d8753c5486f3bc63b9d043c3b0886d4e7282 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -605,16 +605,10 @@ void ExistingUserController::OnAuthFailure(const AuthFailure& failure) {
ShowError(IDS_LOGIN_ERROR_OFFLINE_FAILED_NETWORK_NOT_CONNECTED, error);
} else {
// TODO(nkostylev): Cleanup rest of ClientLogin related code.
- if (failure.reason() == AuthFailure::NETWORK_AUTH_FAILED &&
- failure.error().state() ==
- GoogleServiceAuthError::HOSTED_NOT_ALLOWED) {
- ShowError(IDS_LOGIN_ERROR_AUTHENTICATING_HOSTED, error);
- } else {
- if (!is_known_user)
- ShowError(IDS_LOGIN_ERROR_AUTHENTICATING_NEW, error);
- else
- ShowError(IDS_LOGIN_ERROR_AUTHENTICATING, error);
- }
+ if (!is_known_user)
+ ShowError(IDS_LOGIN_ERROR_AUTHENTICATING_NEW, error);
+ else
+ ShowError(IDS_LOGIN_ERROR_AUTHENTICATING, error);
}
if (auth_flow_offline_)
UMA_HISTOGRAM_BOOLEAN("Login.OfflineFailure.IsKnownUser", is_known_user);
@@ -998,9 +992,6 @@ void ExistingUserController::ShowError(int error_id,
case GoogleServiceAuthError::ACCOUNT_DISABLED:
help_topic_id = HelpAppLauncher::HELP_ACCOUNT_DISABLED;
break;
- case GoogleServiceAuthError::HOSTED_NOT_ALLOWED:
- help_topic_id = HelpAppLauncher::HELP_HOSTED_ACCOUNT;
- break;
default:
help_topic_id = HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT;
break;

Powered by Google App Engine
This is Rietveld 408576698