Index: chrome/browser/chromeos/login/existing_user_view.h |
diff --git a/chrome/browser/chromeos/login/existing_user_view.h b/chrome/browser/chromeos/login/existing_user_view.h |
index 004ff2166a4733fecf96fc9ba0066a18d8f2f038..e1196c049d8e4514a3a98c68af85d7170817a8ac 100644 |
--- a/chrome/browser/chromeos/login/existing_user_view.h |
+++ b/chrome/browser/chromeos/login/existing_user_view.h |
@@ -6,6 +6,7 @@ |
#define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_VIEW_H_ |
#pragma once |
+#include "chrome/browser/chromeos/login/user_input.h" |
#include "views/accelerator.h" |
#include "views/controls/button/native_button.h" |
#include "views/controls/textfield/textfield.h" |
@@ -15,34 +16,53 @@ namespace chromeos { |
class UserController; |
-class ExistingUserView : public views::View { |
+class ExistingUserView : public UserInput, |
+ public views::Textfield::Controller, |
+ public views::View { |
public: |
- explicit ExistingUserView(UserController* uc); |
+ explicit ExistingUserView(UserController* user_controller); |
void RecreateFields(); |
- views::Textfield* password_field() { return password_field_; } |
- |
void FocusPasswordField(); |
// Overridden from views::View: |
virtual bool AcceleratorPressed(const views::Accelerator& accelerator); |
+ // Textfield::Controller: |
whywhat
2010/12/09 16:20:18
Could you use consistent "Overridden from " prefix
altimofeev
2010/12/10 16:37:40
Done.
|
+ virtual void ContentsChanged(views::Textfield* sender, |
+ const string16& new_contents); |
+ |
+ virtual bool HandleKeystroke(views::Textfield* sender, |
+ const views::Textfield::Keystroke& keystroke); |
+ |
+ // Implements UserInput: |
+ virtual void EnableInputControls(bool enabled); |
+ |
+ virtual void ClearAndFocusControls(); |
+ |
+ virtual void ClearAndFocusPassword(); |
+ |
+ virtual gfx::Rect GetControlWithErrorBounds() const; |
+ |
+ virtual bool UseCustomBoundsForThrobber(const gfx::Size& throbber, |
+ gfx::Rect* bounds) const; |
+ |
protected: |
// Overridden from views::View: |
virtual void OnLocaleChanged(); |
+ |
virtual void ViewHierarchyChanged(bool is_add, |
views::View* parent, |
views::View* child); |
- views::Accelerator accel_login_off_the_record_; |
+ private: |
+ UserController* user_controller_; |
// For editing the password. |
views::Textfield* password_field_; |
- UserController* user_controller_; |
- |
- private: |
+ views::Accelerator accel_login_off_the_record_; |
views::Accelerator accel_enable_accessibility_; |
DISALLOW_COPY_AND_ASSIGN(ExistingUserView); |