Fixed error message bubbles according to the latest mocks

chrome/browser/chromeos/login/new_user_view.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/new_user_view.h"
 
 #include <signal.h>
 #include <sys/types.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
-#include "chrome/browser/google_util.h"
 #include "grit/generated_resources.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
 #include "views/widget/widget_gtk.h"
 
 using views::Label;
 using views::Textfield;
 using views::View;
 using views::WidgetGtk;
 
 namespace {
 
 // NOTE: When adding new controls check RecreateNativeControls()
 // that |sign_in_button_| is added with correct index.
 const int kSignInButtonFocusOrderIndex = 3;
 const int kTextfieldWidth = 286;
 const int kRowPad = 7;
 const int kColumnPad = 7;
 const int kLanguagesMenuWidth = 200;
 const int kLanguagesMenuHeight = 30;
 const SkColor kErrorColor = 0xFF8F384F;
 const char kDefaultDomain[] = "@gmail.com";
 
-const char kAccountRecoveryHelpUrl[] =
-    "http://www.google.com/support/accounts/bin/answer.py?answer=48598";
-
 // Textfield that adds domain to the entered username if focus is lost and
 // username doesn't have full domain.
 class UsernameField : public views::Textfield {
  public:
   UsernameField() {}
 
   // views::Textfield overrides:
   virtual void WillLoseFocus() {
     if (!text().empty()) {
       std::string username = UTF16ToUTF8(text());
@@ skipping 281 matching lines @@
 }
 
 void NewUserView::LinkActivated(views::Link* source, int event_flags) {
   if (source == create_account_link_) {
     delegate_->OnCreateAccount();
   } else if (source == browse_without_signin_link_) {
     delegate_->OnLoginOffTheRecord();
   } else if (source == cant_access_account_link_) {
     // TODO(nkostylev): Display offline help when network is not connected.
     // http://crosbug.com/3874
-    delegate_->AddStartUrl(
-        google_util::AppendGoogleLocaleParam(GURL(kAccountRecoveryHelpUrl)));
+    delegate_->AddStartUrl(GetAccountRecoveryHelpUrl());
     delegate_->OnLoginOffTheRecord();
   }
 }
 
 void NewUserView::ClearAndEnablePassword() {
   login_in_process_ = false;
   EnableInputControls(true);
   SetPassword(std::string());
   password_field_->RequestFocus();
   throbber_->Stop();
 }
 
 void NewUserView::ClearAndEnableFields() {
   login_in_process_ = false;
   EnableInputControls(true);
   SetUsername(std::string());
   SetPassword(std::string());
   username_field_->RequestFocus();
   throbber_->Stop();
 }
 
 gfx::Rect NewUserView::GetPasswordBounds() const {
-  gfx::Rect screen_bounds(password_field_->bounds());
-  gfx::Point origin(screen_bounds.origin());
-  views::View::ConvertPointToScreen(password_field_->GetParent(), &origin);
-  screen_bounds.set_origin(origin);
-  return screen_bounds;
+  return password_field_->GetScreenBounds();
+}
+
+gfx::Rect NewUserView::GetUsernameBounds() const {
+  return username_field_->GetScreenBounds();
 }
 
 void NewUserView::StopThrobber() {
   throbber_->Stop();
 }
 
 bool NewUserView::HandleKeystroke(views::Textfield* s,
     const views::Textfield::Keystroke& keystroke) {
   if (!CrosLibrary::Get()->EnsureLoaded() || login_in_process_)
     return false;
@@ skipping 25 matching lines @@
   browse_without_signin_link_->SetEnabled(enabled);
 }
 
 void NewUserView::InitLink(views::Link** link) {
   *link = new views::Link(std::wstring());
   (*link)->SetController(this);
   AddChildView(*link);
 }
 
 }  // namespace chromeos