| Index: ash/system/chromeos/tray_caps_lock.h
|
| diff --git a/ash/system/chromeos/tray_caps_lock.h b/ash/system/chromeos/tray_caps_lock.h
|
| index f24ad6b33fa05b4b73f8eb91f4a33c59d3c88144..49251d235e764ab63204e0d428599ad4621871ff 100644
|
| --- a/ash/system/chromeos/tray_caps_lock.h
|
| +++ b/ash/system/chromeos/tray_caps_lock.h
|
| @@ -6,6 +6,7 @@
|
| #define ASH_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_
|
|
|
| #include "ash/system/tray/tray_image_item.h"
|
| +#include "chromeos/ime/xkeyboard.h"
|
| #include "ui/events/event_handler.h"
|
|
|
| namespace views {
|
| @@ -17,13 +18,15 @@ namespace ash {
|
| class CapsLockDefaultView;
|
|
|
| class TrayCapsLock : public TrayImageItem,
|
| - public ui::EventHandler {
|
| + public ui::EventHandler,
|
| + public chromeos::input_method::XKeyboard::Observer {
|
| public:
|
| explicit TrayCapsLock(SystemTray* system_tray);
|
| virtual ~TrayCapsLock();
|
|
|
| private:
|
| - void OnCapsLockChanged(bool enabled);
|
| + // Overriden from chromeos::input_method::XKeyboard::Observer:
|
| + virtual void OnCapsLockChanged(bool enabled) OVERRIDE;
|
|
|
| // ui::EventHandler:
|
| virtual void OnKeyEvent(ui::KeyEvent* key) OVERRIDE;
|
|
|