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

Unified Diff: chrome/browser/chromeos/login/views_login_display.cc

Issue 6469027: [cros] Report captive portal message when we suspect that might be the case. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 10 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
« no previous file with comments | « chrome/browser/chromeos/login/views_login_display.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/views_login_display.cc
diff --git a/chrome/browser/chromeos/login/views_login_display.cc b/chrome/browser/chromeos/login/views_login_display.cc
index b2ceb9079398b75633e7cfe9e30c854b320da137..553d1615b38ffb47e705a943ba4a8712d3e26c16 100644
--- a/chrome/browser/chromeos/login/views_login_display.cc
+++ b/chrome/browser/chromeos/login/views_login_display.cc
@@ -192,6 +192,7 @@ void ViewsLoginDisplay::ShowError(int error_msg_id,
HelpAppLauncher::HelpTopic help_topic_id) {
ClearErrors();
string16 error_text;
+ error_msg_id_ = error_msg_id;
help_topic_id_ = help_topic_id;
// GetStringF fails on debug build if there's no replacement in the string.
@@ -214,8 +215,10 @@ void ViewsLoginDisplay::ShowError(int error_msg_id,
}
string16 help_link;
- if (error_msg_id == IDS_LOGIN_ERROR_AUTHENTICATING_HOSTED ||
- login_attempts > 1) {
+ if (error_msg_id == IDS_LOGIN_ERROR_CAPTIVE_PORTAL) {
+ help_link = l10n_util::GetStringUTF16(IDS_LOGIN_FIX_CAPTIVE_PORTAL);
+ } else if (error_msg_id == IDS_LOGIN_ERROR_AUTHENTICATING_HOSTED ||
+ login_attempts > 1) {
help_link = l10n_util::GetStringUTF16(IDS_LEARN_MORE);
}
@@ -287,6 +290,10 @@ void ViewsLoginDisplay::SelectUser(int index) {
//
void ViewsLoginDisplay::OnHelpLinkActivated() {
+ if (error_msg_id_ == IDS_LOGIN_ERROR_CAPTIVE_PORTAL) {
+ delegate()->FixCaptivePortal();
+ return;
+ }
if (!parent_window())
return;
if (!help_app_.get())
« no previous file with comments | « chrome/browser/chromeos/login/views_login_display.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698