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

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_display.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/ui/webui_login_display.cc
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.cc b/chrome/browser/chromeos/login/ui/webui_login_display.cc
index d70c6af019b916627ebb8354671cd4b21f8e831f..89bb6044dc0e675c1cdbc0c363e1d6baa3618b04 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.cc
@@ -115,10 +115,6 @@ void WebUILoginDisplay::ShowError(int error_msg_id,
std::string error_text;
switch (error_msg_id) {
- case IDS_LOGIN_ERROR_AUTHENTICATING_HOSTED:
- error_text = l10n_util::GetStringFUTF8(
- error_msg_id, l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME));
- break;
case IDS_LOGIN_ERROR_CAPTIVE_PORTAL:
error_text = l10n_util::GetStringFUTF8(
error_msg_id, delegate()->GetConnectedNetworkName());
@@ -152,15 +148,8 @@ void WebUILoginDisplay::ShowError(int error_msg_id,
}
std::string help_link;
- switch (error_msg_id) {
- case IDS_LOGIN_ERROR_AUTHENTICATING_HOSTED:
- help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE);
- break;
- default:
- if (login_attempts > 1)
- help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE);
- break;
- }
+ if (login_attempts > 1)
+ help_link = l10n_util::GetStringUTF8(IDS_LEARN_MORE);
webui_handler_->ShowError(login_attempts, error_text, help_link,
help_topic_id);
« no previous file with comments | « chrome/browser/chromeos/login/help_app_launcher.h ('k') | chrome/browser/signin/signin_error_notifier_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698