| Index: ash/system/user/tray_user.h
|
| diff --git a/ash/system/user/tray_user.h b/ash/system/user/tray_user.h
|
| index 1e0aa281ea404daefebe0d815911b8422657e9c2..54dd974de27da9d8a361e4cfb0688d595b1218f1 100644
|
| --- a/ash/system/user/tray_user.h
|
| +++ b/ash/system/user/tray_user.h
|
| @@ -61,19 +61,19 @@ class ASH_EXPORT TrayUser : public SystemTrayItem,
|
|
|
| private:
|
| // 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 UserObserver.
|
| - virtual void OnUserUpdate() OVERRIDE;
|
| - virtual void OnUserAddedToSession() OVERRIDE;
|
| + virtual void OnUserUpdate() override;
|
| + virtual void OnUserAddedToSession() override;
|
|
|
| void UpdateAvatarImage(user::LoginStatus status);
|
|
|
|
|