| Index: chrome/browser/chromeos/login/login_screen.cc
|
| diff --git a/chrome/browser/chromeos/login/login_screen.cc b/chrome/browser/chromeos/login/login_screen.cc
|
| index 847106e69b6c3d01750e1c2770e63b32c408ceff..23493ef90696bc565784c913120ca3c07a2515ea 100644
|
| --- a/chrome/browser/chromeos/login/login_screen.cc
|
| +++ b/chrome/browser/chromeos/login/login_screen.cc
|
| @@ -17,6 +17,7 @@
|
| #include "chrome/browser/chromeos/cros/cros_library.h"
|
| #include "chrome/browser/chromeos/cros/network_library.h"
|
| #include "chrome/browser/chromeos/login/authentication_notification_details.h"
|
| +#include "chrome/browser/chromeos/login/helper.h"
|
| #include "chrome/browser/chromeos/login/login_utils.h"
|
| #include "chrome/browser/chromeos/login/message_bubble.h"
|
| #include "chrome/browser/chromeos/login/screen_observer.h"
|
| @@ -86,7 +87,7 @@ void LoginScreen::OnLoginFailure(const LoginFailure& failure) {
|
| } else if (!network->Connected()) {
|
| ShowError(IDS_LOGIN_ERROR_OFFLINE_FAILED_NETWORK_NOT_CONNECTED, error);
|
| } else {
|
| - ShowError(IDS_LOGIN_ERROR_AUTHENTICATING, error);
|
| + ShowError(IDS_LOGIN_ERROR_AUTHENTICATING_NEW, error);
|
| }
|
|
|
| view()->ClearAndEnablePassword();
|
| @@ -105,6 +106,11 @@ void LoginScreen::OnOffTheRecordLoginSuccess() {
|
| LoginUtils::Get()->CompleteOffTheRecordLogin(start_url_);
|
| }
|
|
|
| +void LoginScreen::OnHelpLinkActivated() {
|
| + AddStartUrl(GetAccountRecoveryHelpUrl());
|
| + OnLoginOffTheRecord();
|
| +}
|
| +
|
| void LoginScreen::AppendStartUrlToCmdline() {
|
| if (start_url_.is_valid())
|
| CommandLine::ForCurrentProcess()->AppendArg(start_url_.spec());
|
| @@ -123,6 +129,7 @@ void LoginScreen::ShowError(int error_id, const std::string& details) {
|
| BubbleBorder::LEFT_TOP,
|
| ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING),
|
| error_text,
|
| + l10n_util::GetString(IDS_CANT_ACCESS_ACCOUNT_BUTTON),
|
| this);
|
| }
|
|
|
|
|