Commit 766b3793 authored by Roman Sorokin's avatar Roman Sorokin Committed by Commit Bot

Chromad: Show proper error for the network error

Shows network error message instead of an unknown error message

BUG=842619
TEST=manual

Change-Id: I5149fbed8282c44e9cf1960d3b4a6f013095f983
Reviewed-on: https://chromium-review.googlesource.com/1098693Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Commit-Queue: Roman Sorokin <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567185}
parent cfa9765a
......@@ -245,6 +245,17 @@ user_manager::UserType CalculateUserType(const AccountId& account_id) {
return user_manager::USER_TYPE_REGULAR;
}
std::string GetAdErrorMessage(authpolicy::ErrorType error) {
switch (error) {
case authpolicy::ERROR_NETWORK_PROBLEM:
return l10n_util::GetStringUTF8(IDS_AD_AUTH_NETWORK_ERROR);
default:
DLOG(WARNING) << "Unhandled error code: " << error;
return l10n_util::GetStringUTF8(IDS_AD_AUTH_UNKNOWN_ERROR);
}
}
} // namespace
// A class that's used to specify the way how Gaia should be loaded.
......@@ -688,11 +699,10 @@ void GaiaScreenHandler::DoAdAuth(
static_cast<int>(ActiveDirectoryErrorState::BAD_PASSWORD));
break;
default:
DLOG(WARNING) << "Unhandled error code: " << error;
CallJS("invalidateAd", username,
static_cast<int>(ActiveDirectoryErrorState::NONE));
core_oobe_view_->ShowSignInError(
0, l10n_util::GetStringUTF8(IDS_AD_AUTH_UNKNOWN_ERROR), std::string(),
0, GetAdErrorMessage(error), std::string(),
HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT);
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment