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

chrome/browser/chromeos/login/screen_lock_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/screen_lock_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/user_view.h"
 #include "chrome/browser/chromeos/login/username_view.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/chromeos/login/textfield_with_margin.h"
 #include "chrome/browser/chromeos/views/copy_background.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/notification_service.h"
@@ skipping 39 matching lines @@
 
 ScreenLockView::ScreenLockView(ScreenLocker* screen_locker)
     : user_view_(NULL),
       password_field_(NULL),
       screen_locker_(screen_locker),
       main_(NULL),
       username_(NULL) {
   DCHECK(screen_locker_);
 }
 
+ScreenLockView::~ScreenLockView() {
+}
+
 gfx::Size ScreenLockView::GetPreferredSize() {
   return main_->GetPreferredSize();
 }
 
 void ScreenLockView::Layout() {
   int username_height = login::kSelectedLabelHeight;
   main_->SetBounds(0, 0, width(), height());
   username_->SetBounds(
       kBorderSize,
       login::kUserImageSize - username_height + kBorderSize,
@@ skipping 13 matching lines @@
   // Use rounded rect background.
   views::Painter* painter =
       CreateWizardPainter(&BorderDefinition::kUserBorder);
 
   main_->set_background(
       views::Background::CreateBackgroundPainter(true, painter));
   main_->set_border(CreateWizardBorder(&BorderDefinition::kUserBorder));
 
   // Password field.
   password_field_ = new PasswordField();
+
   password_field_->SetController(this);
   password_field_->set_background(new CopyBackground(main_));
 
+  // Setup ThrobberView's host view.
+  set_host_view(password_field_);
+
   // User icon.
   UserManager::User user = screen_locker_->user();
   user_view_->SetImage(user.image(), user.image());
 
   // User name.
   std::wstring text = UTF8ToWide(user.GetDisplayName());
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& font = rb.GetFont(ResourceBundle::MediumBoldFont);
 
@@ skipping 37 matching lines @@
 void ScreenLockView::SetSignoutEnabled(bool enabled) {
   user_view_->SetSignoutEnabled(enabled);
 }
 
 gfx::Rect ScreenLockView::GetPasswordBoundsRelativeTo(const views::View* view) {
   gfx::Point p;
   views::View::ConvertPointToView(password_field_, view, &p);
   return gfx::Rect(p, size());
 }
 
+
 void ScreenLockView::SetEnabled(bool enabled) {
   views::View::SetEnabled(enabled);
 
   if (!enabled) {
-    user_view_->StartThrobber();
     // TODO(oshima): Re-enabling does not move the focus to the view
     // that had a focus (issue http://crbug.com/43131).
     // Clear focus on the textfield so that re-enabling can set focus
     // back to the text field.
     // FocusManager may be null if the view does not have
     // associated Widget yet.
     if (password_field_->GetFocusManager())
       password_field_->GetFocusManager()->ClearFocus();
-  } else {
-    user_view_->StopThrobber();
   }
   password_field_->SetEnabled(enabled);
 }
 
 void ScreenLockView::OnSignout() {
   screen_locker_->Signout();
 }
 
 bool ScreenLockView::HandleKeystroke(
     views::Textfield* sender,
@@ skipping 18 matching lines @@
     return;
   user_view_->SetImage(user->image(), user->image());
 }
 
 void ScreenLockView::ViewHierarchyChanged(bool is_add,
                                           views::View* parent,
                                           views::View* child) {
   if (is_add && this == child)
     WizardAccessibilityHelper::GetInstance()->MaybeEnableAccessibility(this);
 }
+
 }  // namespace chromeos