Fixed error message bubbles according to the latest mocks

chrome/browser/chromeos/login/login_screen.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/login_screen.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #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"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 namespace chromeos {
@@ skipping 49 matching lines @@
   LOG(INFO) << "LoginManagerView: OnLoginFailure() " << error;
   NetworkLibrary* network = CrosLibrary::Get()->GetNetworkLibrary();
 
   // Check networking after trying to login in case user is
   // cached locally or the local admin account.
   if (!network || !CrosLibrary::Get()->EnsureLoaded()) {
     ShowError(IDS_LOGIN_ERROR_NO_NETWORK_LIBRARY, error);
   } 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();
 }
 
 void LoginScreen::OnLoginSuccess(const std::string& username,
     const GaiaAuthConsumer::ClientLoginResult& credentials) {
 
   delegate()->GetObserver(this)->OnExit(ScreenObserver::LOGIN_SIGN_IN_SELECTED);
   AppendStartUrlToCmdline();
   LoginUtils::Get()->CompleteLogin(username, credentials);
 }
 
 void LoginScreen::OnOffTheRecordLoginSuccess() {
   delegate()->GetObserver(this)->OnExit(ScreenObserver::LOGIN_GUEST_SELECTED);
   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());
 }
 
 void LoginScreen::ShowError(int error_id, const std::string& details) {
   ClearErrors();
   std::wstring error_text = l10n_util::GetString(error_id);
   // TODO(dpolukhin): show detailed error info. |details| string contains
   // low level error info that is not localized and even is not user friendly.
   // For now just ignore it because error_text contains all required information
   // for end users, developers can see details string in Chrome logs.
   bubble_ = MessageBubble::Show(
       view()->GetWidget(),
       view()->GetPasswordBounds(),
       BubbleBorder::LEFT_TOP,
       ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING),
       error_text,
+      l10n_util::GetString(IDS_CANT_ACCESS_ACCOUNT_BUTTON),
       this);
 }
 
 }  // namespace chromeos