Index: chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc |
diff --git a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc |
index b9e5bcdf83ca9fa5ed044f8f6d02bf2194cc50a6..5ff763ff13b5f50408b8654c5d27d5190565cad2 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc |
@@ -90,6 +90,11 @@ void ErrorScreenHandler::ShowCaptivePortalError(const std::string& network) { |
state_ = STATE_CAPTIVE_PORTAL_ERROR; |
} |
+void ErrorScreenHandler::ShowTimeoutError() { |
+ web_ui()->CallJavascriptFunction("login.ErrorMessageScreen.showTimeoutError"); |
+ state_ = STATE_TIMEOUT_ERROR; |
+} |
+ |
void ErrorScreenHandler::ShowOfflineError() { |
web_ui()->CallJavascriptFunction("login.ErrorMessageScreen.showOfflineError"); |
state_ = STATE_OFFLINE_ERROR; |
@@ -152,6 +157,8 @@ void ErrorScreenHandler::GetLocalizedStrings( |
l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL)); |
localized_strings->SetString("captivePortalProxyMessage", |
l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_PROXY)); |
+ localized_strings->SetString("timeoutMessageTitle", |
+ l10n_util::GetStringUTF16(IDS_LOGIN_TIMEOUT_TITLE)); |
localized_strings->SetString("captivePortalNetworkSelect", |
l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_NETWORK_SELECT)); |
localized_strings->SetString("proxyMessageText", |