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

Unified Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

Issue 1058433002: [cros login, new GAIA] New UI for not authorized error (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 8 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/ui/webui/chromeos/login/gaia_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index f6ddc3a8809a247a793edba5ca49adb65412fbca..44aa52f7bdc83b0193f77bc00048810bb1f64f3a 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -324,6 +324,11 @@ void GaiaScreenHandler::DeclareLocalizedValues(
IDS_LOGIN_CONSUMER_MANAGEMENT_ENROLLMENT);
builder->Add("backButton", IDS_ACCNAME_BACK);
builder->Add("closeButton", IDS_CLOSE);
+ builder->Add("whitelistErrorConsumer", IDS_LOGIN_ERROR_WHITELIST);
+ builder->Add("whitelistErrorEnterprise",
+ IDS_ENTERPRISE_LOGIN_ERROR_WHITELIST);
+ builder->Add("tryAgainButton", IDS_WHITELIST_ERROR_TRY_AGAIN_BUTTON);
+ builder->Add("learnMoreButton", IDS_WHITELIST_ERROR_LEARN_MORE_BUTTON);
builder->Add("gaiaLoadingNewGaia", IDS_LOGIN_GAIA_LOADING_MESSAGE);
// Strings used by the SAML fatal error dialog.
@@ -838,6 +843,15 @@ void GaiaScreenHandler::MaybePreloadAuthExtension() {
}
}
+void GaiaScreenHandler::ShowWhitelistCheckFailedError() {
+ base::DictionaryValue params;
+ params.SetBoolean("enterpriseManaged",
+ g_browser_process->platform_part()
+ ->browser_policy_connector_chromeos()
+ ->IsEnterpriseManaged());
+ CallJS("showWhitelistCheckFailedError", true, params);
+}
+
void GaiaScreenHandler::LoadAuthExtension(bool force,
bool silent_load,
bool offline) {

Powered by Google App Engine
This is Rietveld 408576698