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) { |