| Index: chrome/browser/chromeos/login/screen_lock_view.h
|
| diff --git a/chrome/browser/chromeos/login/screen_lock_view.h b/chrome/browser/chromeos/login/screen_lock_view.h
|
| index 6c1907af724e820cb6c027e9bc38a55c66964c0f..7e05892102a166b349c10f691aec43534c0cefde 100644
|
| --- a/chrome/browser/chromeos/login/screen_lock_view.h
|
| +++ b/chrome/browser/chromeos/login/screen_lock_view.h
|
| @@ -10,7 +10,7 @@
|
| #include "chrome/browser/chromeos/login/user_view.h"
|
| #include "content/common/notification_observer.h"
|
| #include "content/common/notification_registrar.h"
|
| -#include "views/controls/textfield/textfield.h"
|
| +#include "views/controls/textfield/textfield_controller.h"
|
| #include "views/view.h"
|
|
|
| namespace views {
|
| @@ -29,7 +29,7 @@ class ScreenLockerTester;
|
| // ScreenLockView creates view components necessary to authenticate
|
| // a user to unlock the screen.
|
| class ScreenLockView : public ThrobberHostView,
|
| - public views::Textfield::Controller,
|
| + public views::TextfieldController,
|
| public NotificationObserver,
|
| public UserView::Delegate {
|
| public:
|
| @@ -47,23 +47,23 @@ class ScreenLockView : public ThrobberHostView,
|
| // Returns the bounds of the password field in ScreenLocker's coordinate.
|
| gfx::Rect GetPasswordBoundsRelativeTo(const views::View* view);
|
|
|
| - // views::View implementation:
|
| + // views::View:
|
| virtual void SetEnabled(bool enabled);
|
| virtual void Layout();
|
| virtual gfx::Size GetPreferredSize();
|
|
|
| - // NotificationObserver implementation:
|
| + // NotificationObserver:
|
| virtual void Observe(NotificationType type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details);
|
|
|
| - // views::Textfield::Controller implementation:
|
| + // views::TextfieldController:
|
| virtual void ContentsChanged(views::Textfield* sender,
|
| const string16& new_contents);
|
| virtual bool HandleKeyEvent(views::Textfield* sender,
|
| const views::KeyEvent& keystroke);
|
|
|
| - // UserView::Delegate implementation:
|
| + // UserView::Delegate:
|
| virtual void OnSignout();
|
| virtual bool IsUserSelected() const { return true; }
|
|
|
|
|