| Index: chrome/browser/chromeos/login/screen_locker_views.h
|
| diff --git a/chrome/browser/chromeos/login/screen_locker_views.h b/chrome/browser/chromeos/login/screen_locker_views.h
|
| index db95a5cac37285ae5986be02740b501535355c59..aa6eef8e6c05714eb45dfe06bca06a98d465da25 100644
|
| --- a/chrome/browser/chromeos/login/screen_locker_views.h
|
| +++ b/chrome/browser/chromeos/login/screen_locker_views.h
|
| @@ -30,7 +30,7 @@ class ScreenLockerTester;
|
| class ScreenLockerViews : public ScreenLockerDelegate,
|
| public MessageBubbleDelegate,
|
| public CaptchaView::Delegate,
|
| - public views::AcceleratorTarget {
|
| + public ui::AcceleratorTarget {
|
| public:
|
| // Interface that helps switching from ScreenLockView to CaptchaView.
|
| class ScreenLockViewContainer {
|
| @@ -90,9 +90,8 @@ class ScreenLockerViews : public ScreenLockerDelegate,
|
| void ShowErrorBubble(const string16& message,
|
| views::BubbleBorder::ArrowLocation arrow_location);
|
|
|
| - // Overridden from AcceleratorTarget:
|
| - virtual bool AcceleratorPressed(const views::Accelerator& accelerator)
|
| - OVERRIDE;
|
| + // Overridden from ui::AcceleratorTarget:
|
| + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
|
|
|
| // Event handler for client-event.
|
| CHROMEGTK_CALLBACK_1(ScreenLockerViews, void, OnClientEvent, GdkEventClient*);
|
|
|