| 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 08c4eeabd07807f7fd46fa057748318a5a361543..be5c5ce959b60a81a1b0a3d32c6b19078530b896 100644
|
| --- a/chrome/browser/chromeos/login/existing_user_view.h
|
| +++ b/chrome/browser/chromeos/login/existing_user_view.h
|
| @@ -10,7 +10,7 @@
|
| #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"
|
| +#include "views/controls/textfield/textfield_controller.h"
|
| #include "views/view.h"
|
|
|
| namespace chromeos {
|
| @@ -19,7 +19,7 @@ class UserController;
|
|
|
| class ExistingUserView : public ThrobberHostView,
|
| public UserInput,
|
| - public views::Textfield::Controller {
|
| + public views::TextfieldController {
|
| public:
|
| explicit ExistingUserView(UserController* user_controller);
|
|
|
| @@ -27,23 +27,24 @@ class ExistingUserView : public ThrobberHostView,
|
|
|
| void FocusPasswordField();
|
|
|
| - // Overridden from views::View:
|
| + // views::View:
|
| virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
|
| - // Overriden from Textfield::Controller:
|
| +
|
| + // views::TextfieldController:
|
| virtual void ContentsChanged(views::Textfield* sender,
|
| const string16& new_contents);
|
| virtual bool HandleKeyEvent(views::Textfield* sender,
|
| const views::KeyEvent& keystroke);
|
| virtual void RequestFocus();
|
|
|
| - // Overriden from UserInput:
|
| + // UserInput:
|
| virtual void EnableInputControls(bool enabled);
|
| virtual void ClearAndFocusControls();
|
| virtual void ClearAndFocusPassword();
|
| virtual gfx::Rect GetMainInputScreenBounds() const;
|
|
|
| protected:
|
| - // Overridden from views::View:
|
| + // views::View:
|
| virtual void OnLocaleChanged();
|
|
|
| private:
|
|
|