Place the spinner in the right corner of the controls window.

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/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.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/chromeos/login/textfield_with_margin.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/chromeos/views/copy_background.h"
 #include "gfx/font.h"
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "views/controls/label.h"
@@ skipping 54 matching lines @@
       title_label_(NULL),
       title_hint_label_(NULL),
       splitter_up1_(NULL),
       splitter_up2_(NULL),
       splitter_down1_(NULL),
       splitter_down2_(NULL),
       sign_in_button_(NULL),
       create_account_link_(NULL),
       guest_link_(NULL),
       languages_menubutton_(NULL),
-      throbber_(NULL),
       accel_focus_pass_(views::Accelerator(app::VKEY_P, false, false, true)),
       accel_focus_user_(views::Accelerator(app::VKEY_U, false, false, true)),
       accel_login_off_the_record_(
           views::Accelerator(app::VKEY_B, false, false, true)),
       accel_enable_accessibility_(WizardAccessibilityHelper::GetAccelerator()),
       delegate_(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(focus_grabber_factory_(this)),
       focus_delayed_(false),
       login_in_process_(false),
       need_border_(need_border),
@@ skipping 42 matching lines @@
   splitter_down2_ = CreateSplitter(kSplitterDown2Color);
 
   username_field_ = new UsernameField();
   username_field_->set_background(new CopyBackground(this));
   AddChildView(username_field_);
 
   password_field_ = new TextfieldWithMargin(views::Textfield::STYLE_PASSWORD);
   password_field_->set_background(new CopyBackground(this));
   AddChildView(password_field_);
 
-  throbber_ = CreateDefaultSmoothedThrobber();
-  AddChildView(throbber_);
-
   language_switch_menu_.InitLanguageMenu();
 
   RecreatePeculiarControls();
 
   AddChildView(sign_in_button_);
   if (need_create_account_) {
     InitLink(&create_account_link_);
   }
   if (need_guest_link_) {
     InitLink(&guest_link_);
@@ skipping 236 matching lines @@
   // Center main controls.
   height = username_field_->GetPreferredSize().height() +
            password_field_->GetPreferredSize().height() +
            sign_in_button_->GetPreferredSize().height() +
            2 * kRowPad;
   y = title_end + (bottom_start - title_end - height) / 2;
 
   y += setViewBounds(username_field_, x, y, width, true) + kRowPad;
   y += setViewBounds(password_field_, x, y, width, true) + kRowPad;
 
-  int throbber_y = y;
   int sign_in_button_width = sign_in_button_->GetPreferredSize().width();
   setViewBounds(sign_in_button_, x, y, sign_in_button_width,true);
-  setViewBounds(throbber_,
-                x + width - throbber_->GetPreferredSize().width(),
-                throbber_y + (sign_in_button_->GetPreferredSize().height() -
-                              throbber_->GetPreferredSize().height()) / 2,
-                width,
-                false);
 
   SchedulePaint();
 }
 
 gfx::Size NewUserView::GetPreferredSize() {
   return need_guest_link_ ?
       gfx::Size(kNewUserPodFullWidth, kNewUserPodFullHeight) :
       gfx::Size(kNewUserPodSmallWidth, kNewUserPodSmallHeight);
 }
 
 void NewUserView::SetUsername(const std::string& username) {
   username_field_->SetText(UTF8ToUTF16(username));
 }
 
 void NewUserView::SetPassword(const std::string& password) {
   password_field_->SetText(UTF8ToUTF16(password));
 }
 
 void NewUserView::Login() {
   if (login_in_process_ || username_field_->text().empty())
     return;
 
-  StartThrobber();
   login_in_process_ = true;
-  EnableInputControls(false);
   std::string username = UTF16ToUTF8(username_field_->text());
   // todo(cmasone) Need to sanitize memory used to store password.
   std::string password = UTF16ToUTF8(password_field_->text());
 
   if (username.find('@') == std::string::npos) {
     username += kDefaultDomain;
     username_field_->SetText(UTF8ToUTF16(username));
   }
 
   delegate_->OnLogin(username, password);
 }
 
 // Sign in button causes a login attempt.
 void NewUserView::ButtonPressed(views::Button* sender,
                                 const views::Event& event) {
   DCHECK(sender == sign_in_button_);
   Login();
 }
 
 void NewUserView::LinkActivated(views::Link* source, int event_flags) {
   if (source == create_account_link_) {
     delegate_->OnCreateAccount();
   } else if (source == guest_link_) {
     delegate_->OnLoginOffTheRecord();
   }
 }
 
-void NewUserView::ClearAndEnablePassword() {
+void NewUserView::ClearAndFocusControls() {
   login_in_process_ = false;
-  EnableInputControls(true);
-  SetPassword(std::string());
-  password_field_->RequestFocus();
-  StopThrobber();
-}
-
-void NewUserView::ClearAndEnableFields() {
-  login_in_process_ = false;
-  EnableInputControls(true);
   SetUsername(std::string());
   SetPassword(std::string());
   username_field_->RequestFocus();
-  StopThrobber();
+}
+
+void NewUserView::ClearAndFocusPassword() {
+  login_in_process_ = false;
+  SetPassword(std::string());
+  password_field_->RequestFocus();
+}
+
+gfx::Rect NewUserView::GetMainInputScreenBounds() const {
+  return GetUsernameBounds();
+}
+
+gfx::Rect NewUserView::CalculateThrobberBounds(views::Throbber* throbber) {
+  DCHECK(password_field_);
+  DCHECK(sign_in_button_);
+
+  gfx::Size throbber_size = throbber->GetPreferredSize();
+  int x = password_field_->x();
+  x += password_field_->width() - throbber_size.width();
+  int y = sign_in_button_->y();
+  y += (sign_in_button_->height() - throbber_size.height()) / 2;
+
+  return gfx::Rect(gfx::Point(x, y), throbber_size);
 }
 
 gfx::Rect NewUserView::GetPasswordBounds() const {
   return password_field_->GetScreenBounds();
 }
 
 gfx::Rect NewUserView::GetUsernameBounds() const {
   return username_field_->GetScreenBounds();
 }
 
-void NewUserView::StartThrobber() {
-  throbber_->Start();
-}
-
-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;
 
   if (keystroke.GetKeyboardCode() == app::VKEY_RETURN) {
     Login();
     // Return true so that processing ends
     return true;
   } else if (keystroke.GetKeyboardCode() == app::VKEY_LEFT) {
@@ skipping 18 matching lines @@
   languages_menubutton_->SetEnabled(enabled);
   username_field_->SetEnabled(enabled);
   password_field_->SetEnabled(enabled);
   sign_in_button_->SetEnabled(enabled);
   if (need_create_account_) {
     create_account_link_->SetEnabled(enabled);
   }
   if (need_guest_link_) {
     guest_link_->SetEnabled(enabled);
   }
-  delegate_->SetStatusAreaEnabled(enabled);
 }
 
 void NewUserView::InitLink(views::Link** link) {
   *link = new views::Link(std::wstring());
   (*link)->SetController(this);
   (*link)->SetNormalColor(login::kLinkColor);
   (*link)->SetHighlightedColor(login::kLinkColor);
   AddChildView(*link);
 }
 
 }  // namespace chromeos