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

chrome/browser/chromeos/login/user_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_CONTROLLER_H_
 #pragma once
 
 #include <string>
 
 #include "base/string16.h"
 #include "base/task.h"
 #include "chrome/browser/chromeos/login/new_user_view.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/user_view.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "views/controls/button/button.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/widget/widget_delegate.h"
 namespace views {
 class WidgetGtk;
 }
 
 namespace chromeos {
 
-class ExistingUserView;
-class GuestUserView;
-class UserView;
+class ThrobberManager;
 
 // UserController manages the set of windows needed to login a single existing
 // user or first time login for a new user. ExistingUserController creates
 // the nececessary set of UserControllers.
-class UserController : public views::ButtonListener,
-                       public views::Textfield::Controller,
-                       public views::WidgetDelegate,
+class UserController : public views::WidgetDelegate,
                        public NewUserView::Delegate,
                        public NotificationObserver,
                        public UserView::Delegate {
  public:
   class Delegate {
    public:
     virtual void Login(UserController* source,
                        const string16& password) = 0;
     virtual void LoginOffTheRecord() = 0;
     virtual void ClearErrors() = 0;
@@ skipping 24 matching lines @@
   void Init(int index, int total_user_count, bool need_browse_without_signin);
 
   // Update border window parameters to notify window manager about new numbers.
   // |index| of this user and |total_user_count| of users.
   void UpdateUserCount(int index, int total_user_count);
 
   int user_index() const { return user_index_; }
   bool is_user_selected() const { return is_user_selected_; }
   bool is_new_user() const { return is_new_user_; }
   bool is_guest() const { return is_guest_; }
-  NewUserView* new_user_view() const { return new_user_view_; }
 
   const UserManager::User& user() const { return user_; }
 
   // Enables or disables tooltip with user's email.
   void EnableNameTooltip(bool enable);
 
-  // Resets password text and sets the enabled state of the password.
-  void ClearAndEnablePassword();
-
   // Called when user view is activated (OnUserSelected).
   void ClearAndEnableFields();
 
-  // Returns bounds of password field in screen coordinates.
-  // For new user it returns username coordinates.
-  gfx::Rect GetScreenBounds() const;
+  // Called when user view is activated (OnUserSelected).
+  void ClearAndEnablePassword();
 
   // Get widget that contains all controls.
   views::WidgetGtk* controls_window() {
     return controls_window_;
   }
 
-  // ButtonListener:
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+  gfx::Rect GetScreenBounds();

[whywhat, 2010/12/09 16:20:18]

const?

[altimofeev, 2010/12/10 16:37:40]

Done.

 
-  // Textfield::Controller:
-  virtual void ContentsChanged(views::Textfield* sender,
-                               const string16& new_contents);
-  virtual bool HandleKeystroke(views::Textfield* sender,
-                               const views::Textfield::Keystroke& keystroke);
+  // Starts/Stops throbber.
+  void StartThrobber();
+  void StopThrobber();
 
   // views::WidgetDelegate:
   virtual void IsActiveChanged(bool active);
 
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // NewUserView::Delegate
   virtual void OnLogin(const std::string& username,
                        const std::string& password);
   virtual void OnCreateAccount();
   virtual void OnLoginOffTheRecord();
   virtual void AddStartUrl(const GURL& start_url) {
     delegate_->AddStartUrl(start_url);
   }
   virtual void ClearErrors();
   virtual void NavigateAway();
   virtual void SetStatusAreaEnabled(bool enable) {
     delegate_->SetStatusAreaEnabled(enable);
   }
 
   // UserView::Delegate implementation:
   virtual void OnRemoveUser();
 
-  // Selects user entry with specified |index|.
-  void SelectUser(int index);
-
-  // Sets focus on password field.
-  void FocusPasswordField();
+  // Selects user relative to the current user.
+  void SelectUserRelative(int shift);
 
   // Padding between the user windows.
   static const int kPadding;
 
   // Max size needed when an entry is not selected.
   static const int kUnselectedSize;
   static const int kNewUserUnselectedSize;
 
  private:
   FRIEND_TEST(UserControllerTest, GetNameTooltip);
 
-  // Invoked when the user wants to login. Forwards the call to the delegate.
-  void Login();
-
   // Performs common setup for login windows.
   void ConfigureLoginWindow(views::WidgetGtk* window,
                             int index,
                             const gfx::Rect& bounds,
                             chromeos::WmIpcWindowType type,
                             views::View* contents_view);
   views::WidgetGtk* CreateControlsWindow(int index,
                                          int* width, int* height,
                                          bool need_guest_link);
   views::WidgetGtk* CreateImageWindow(int index);
   views::WidgetGtk* CreateLabelWindow(int index, WmIpcWindowType type);
   void CreateBorderWindow(int index,
                           int total_user_count,
                           int controls_width, int controls_height);
 
   // Sets specified image on the image window. If image's size is less than
   // 75% of window size, image size is preserved to avoid blur. Otherwise,
   // the image is resized to fit window size precisely. Image view repaints
   // itself.
   void SetImage(const SkBitmap& image);
 
-  // Sets the enabled state of the password field to |enable|.
-  void SetPasswordEnabled(bool enable);
-
   // Returns tooltip text for user name.
   std::wstring GetNameTooltip() const;
 
   // User index within all the users.
   int user_index_;
 
   // Is this user selected now?
   bool is_user_selected_;
 
   // Is this the new user pod?
@@ skipping 17 matching lines @@
   // A window is used to represent the individual chunks.
   views::WidgetGtk* controls_window_;
   views::WidgetGtk* image_window_;
   views::WidgetGtk* border_window_;
   views::WidgetGtk* label_window_;
   views::WidgetGtk* unselected_label_window_;
 
   // View that shows user image on image window.
   UserView* user_view_;
 
-  // View that is used for new user login.
-  NewUserView* new_user_view_;
-
-  // View that is used for existing user login.
-  ExistingUserView* existing_user_view_;
-
-  // View that is used for guest user login.
-  GuestUserView* guest_user_view_;
+  // Input controls which are used for username and password.
+  UserInput* user_input_;
 
   // Views that show display name of the user.
   views::Label* label_view_;
   views::Label* unselected_label_view_;
 
+  scoped_ptr<ThrobberManager> throbber_manager_;
+
   NotificationRegistrar registrar_;
 
   ScopedRunnableMethodFactory<UserController> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_CONTROLLER_H_