Fixed error message bubbles according to the latest mocks

chrome/browser/chromeos/login/existing_user_controller.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/existing_user_controller.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 
@@ skipping 29 matching lines @@
 
 namespace {
 
 // Max number of users we'll show. The true max is the min of this and the
 // number of windows that fit on the screen.
 const size_t kMaxUsers = 6;
 
 // Used to indicate no user has been selected.
 const size_t kNotSelected = -1;
 
+// Offset of cursor in first position from edit left side. It's used to position
+// info bubble arrow to cursor.
+const int kCursorOffset = 5;
+
 // Checks if display names are unique. If there are duplicates, enables
 // tooltips with full emails to let users distinguish their accounts.
 // Otherwise, disables the tooltips.
 void EnableTooltipsIfNeeded(const std::vector<UserController*>& controllers) {
   std::map<std::string, int> visible_display_names;
   for (size_t i = 0; i + 1 < controllers.size(); ++i) {
     const std::string& display_name =
         controllers[i]->user().GetDisplayName();
     ++visible_display_names[display_name];
   }
@@ skipping 10 matching lines @@
 ExistingUserController*
   ExistingUserController::delete_scheduled_instance_ = NULL;
 
 ExistingUserController::ExistingUserController(
     const std::vector<UserManager::User>& users,
     const gfx::Rect& background_bounds)
     : background_bounds_(background_bounds),
       background_window_(NULL),
       background_view_(NULL),
       selected_view_index_(kNotSelected),
+      num_login_attempts_(0),
       bubble_(NULL) {
   if (delete_scheduled_instance_)
     delete_scheduled_instance_->Delete();
 
   // Caclulate the max number of users from available screen size.
   size_t max_users = kMaxUsers;
   int screen_width = background_bounds.width();
   if (screen_width > 0) {
     max_users = std::max(static_cast<size_t>(2), std::min(kMaxUsers,
         static_cast<size_t>((screen_width - login::kUserImageSize)
@@ skipping 92 matching lines @@
   message.set_param(0, is_enabled);
   WmIpc::instance()->SendMessage(message);
 }
 
 void ExistingUserController::Login(UserController* source,
                                    const string16& password) {
   BootTimesLoader::Get()->RecordLoginAttempted();
   std::vector<UserController*>::const_iterator i =
       std::find(controllers_.begin(), controllers_.end(), source);
   DCHECK(i != controllers_.end());
-  selected_view_index_ = i - controllers_.begin();
+
+  if (selected_view_index_ == static_cast<size_t>(i - controllers_.begin())) {
+    num_login_attempts_++;
+  } else {
+    selected_view_index_ = i - controllers_.begin();
+    num_login_attempts_ = 0;
+  }
 
   authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);
   Profile* profile = g_browser_process->profile_manager()->GetDefaultProfile();
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(authenticator_.get(),
                         &Authenticator::AuthenticateToLogin,
                         profile,
                         controllers_[selected_view_index_]->user().email(),
                         UTF16ToUTF8(password),
@@ skipping 23 matching lines @@
 
 void ExistingUserController::OnUserSelected(UserController* source) {
   std::vector<UserController*>::const_iterator i =
       std::find(controllers_.begin(), controllers_.end(), source);
   DCHECK(i != controllers_.end());
   size_t new_selected_index = i - controllers_.begin();
   if (new_selected_index != selected_view_index_ &&
       selected_view_index_ != kNotSelected) {
     controllers_[selected_view_index_]->ClearAndEnableFields();
     ClearCaptchaState();
+    num_login_attempts_ = 0;
   }
   selected_view_index_ = new_selected_index;
 }
 
 void ExistingUserController::ActivateWizard(const std::string& screen_name) {
   // WizardController takes care of deleting itself when done.
   WizardController* controller = new WizardController();
 
   // Give the background window to the controller.
   controller->OwnBackground(background_window_, background_view_);
@@ skipping 59 matching lines @@
         view->set_delegate(this);
         views::Window* window = views::Window::CreateChromeWindow(
             GetNativeWindow(), gfx::Rect(), view);
         window->SetIsAlwaysOnTop(true);
         window->Show();
       } else {
         LOG(WARNING) << "No captcha image url was found?";
         ShowError(IDS_LOGIN_ERROR_AUTHENTICATING, error);
       }
     } else {
-      ShowError(IDS_LOGIN_ERROR_AUTHENTICATING, error);
+      if (controllers_[selected_view_index_]->is_guest())
+        ShowError(IDS_LOGIN_ERROR_AUTHENTICATING_NEW, error);
+      else
+        ShowError(IDS_LOGIN_ERROR_AUTHENTICATING, error);
     }
   }
 
   controllers_[selected_view_index_]->ClearAndEnablePassword();
 
   // Reenable clicking on other windows.
   SendSetLoginState(true);
 }
 
 void ExistingUserController::AppendStartUrlToCmdline() {
@@ skipping 12 matching lines @@
 }
 
 void ExistingUserController::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.
+
+  gfx::Rect bounds = controllers_[selected_view_index_]->GetScreenBounds();
+  BubbleBorder::ArrowLocation arrow;
+  if (controllers_[selected_view_index_]->is_guest()) {
+    arrow = BubbleBorder::LEFT_TOP;
+  } else {
+    // Point info bubble arrow to cursor position (approximately).
+    bounds.set_width(kCursorOffset * 2);
+    arrow = BubbleBorder::BOTTOM_LEFT;
+  }
+  std::wstring help_link;
+  if (num_login_attempts_ > static_cast<size_t>(1))
+    help_link = l10n_util::GetString(IDS_CANT_ACCESS_ACCOUNT_BUTTON);
+
   bubble_ = MessageBubble::Show(
       controllers_[selected_view_index_]->controls_window(),
-      controllers_[selected_view_index_]->GetScreenBounds(),
-      BubbleBorder::BOTTOM_LEFT,
+      bounds,
+      arrow,
       ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING),
       error_text,
+      help_link,
       this);
 }
 
 void ExistingUserController::OnLoginSuccess(const std::string& username,
     const GaiaAuthConsumer::ClientLoginResult& credentials) {
 
   AppendStartUrlToCmdline();
   if (selected_view_index_ + 1 == controllers_.size()) {
     // For new user login don't launch browser until we pass image screen.
     LoginUtils::Get()->EnableBrowserLaunch(false);
@@ skipping 31 matching lines @@
 
   cached_credentials_ = credentials;
   PasswordChangedView* view = new PasswordChangedView(this);
   views::Window* window = views::Window::CreateChromeWindow(GetNativeWindow(),
                                                             gfx::Rect(),
                                                             view);
   window->SetIsAlwaysOnTop(true);
   window->Show();
 }
 
+void ExistingUserController::OnHelpLinkActivated() {
+  AddStartUrl(GetAccountRecoveryHelpUrl());
+  LoginOffTheRecord();
+}
+
 void ExistingUserController::OnCaptchaEntered(const std::string& captcha) {
   login_captcha_ = captcha;
 }
 
 void ExistingUserController::RecoverEncryptedData(
     const std::string& old_password) {
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(authenticator_.get(),
                         &Authenticator::RecoverEncryptedData,
                         old_password,
                         cached_credentials_));
   cached_credentials_ = GaiaAuthConsumer::ClientLoginResult();
 }
 
 void ExistingUserController::ResyncEncryptedData() {
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(authenticator_.get(),
                         &Authenticator::ResyncEncryptedData,
                         cached_credentials_));
   cached_credentials_ = GaiaAuthConsumer::ClientLoginResult();
 }
 
 }  // namespace chromeos