| Index: ash/system/ime/tray_ime.h
|
| diff --git a/ash/system/ime/tray_ime.h b/ash/system/ime/tray_ime.h
|
| index 0f46192bcb85c2d315473432ebb872634c19ba99..587bb765fd972f9491cd8237fb8587cb681f313a 100644
|
| --- a/ash/system/ime/tray_ime.h
|
| +++ b/ash/system/ime/tray_ime.h
|
| @@ -33,18 +33,18 @@ class TrayIME : public SystemTrayItem,
|
| void UpdateTrayLabel(const IMEInfo& info, size_t count);
|
|
|
| // Overridden from SystemTrayItem.
|
| - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
|
| - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
|
| - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
|
| - virtual void DestroyTrayView() OVERRIDE;
|
| - virtual void DestroyDefaultView() OVERRIDE;
|
| - virtual void DestroyDetailedView() OVERRIDE;
|
| - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
|
| + virtual views::View* CreateTrayView(user::LoginStatus status) override;
|
| + virtual views::View* CreateDefaultView(user::LoginStatus status) override;
|
| + virtual views::View* CreateDetailedView(user::LoginStatus status) override;
|
| + virtual void DestroyTrayView() override;
|
| + virtual void DestroyDefaultView() override;
|
| + virtual void DestroyDetailedView() override;
|
| + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
|
| virtual void UpdateAfterShelfAlignmentChange(
|
| - ShelfAlignment alignment) OVERRIDE;
|
| + ShelfAlignment alignment) override;
|
|
|
| // Overridden from IMEObserver.
|
| - virtual void OnIMERefresh() OVERRIDE;
|
| + virtual void OnIMERefresh() override;
|
|
|
| TrayItemView* tray_label_;
|
| tray::IMEDefaultView* default_;
|
|
|