diff options
| author | altimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 18:49:19 +0000 |
|---|---|---|
| committer | altimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 18:49:19 +0000 |
| commit | 83af80b25e45896da6b2947144c27795b0b2b61c (patch) | |
| tree | a7a4ee0b12e7ea745e58440d93fac1ba3755b6e1 /chrome/browser/ui/webui/chromeos | |
| parent | 21c7ff9afa9017603dd43007ce98939c2676a2c6 (diff) | |
| download | chromium_src-83af80b25e45896da6b2947144c27795b0b2b61c.zip chromium_src-83af80b25e45896da6b2947144c27795b0b2b61c.tar.gz chromium_src-83af80b25e45896da6b2947144c27795b0b2b61c.tar.bz2 | |
Implements frame sniffer to watch iframe loading state.
Also sniffer listener was implemented on the WebUI side, which signals when
GAIA page loading error appears.
BUG=chromium-os:18744
TEST=Behind captive portal, try to click 'Add new user'. Corresponding message page should be shown.
Review URL: http://codereview.chromium.org/7779010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/chromeos')
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index d442b77..69ddddb5 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -160,6 +160,8 @@ void SigninScreenHandler::GetLocalizedStrings( l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_TITLE)); localized_strings->SetString("offlineMessageBody", l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_MESSAGE)); + localized_strings->SetString("captivePortalMessage", + l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL)); localized_strings->SetString("createAccount", l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_HTML)); localized_strings->SetString("guestSignin", |