| Index: ash/system/chromeos/network/tray_vpn.h
|
| diff --git a/ash/system/chromeos/network/tray_vpn.h b/ash/system/chromeos/network/tray_vpn.h
|
| index 601d84233bf44265771251a8bc60990de0a04b83..74d7aaa803d04a208643a87003c306d02051f6f1 100644
|
| --- a/ash/system/chromeos/network/tray_vpn.h
|
| +++ b/ash/system/chromeos/network/tray_vpn.h
|
| @@ -25,20 +25,20 @@ class TrayVPN : public SystemTrayItem,
|
| virtual ~TrayVPN();
|
|
|
| // 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;
|
|
|
| // TrayNetworkStateObserver::Delegate
|
| - virtual void NetworkStateChanged(bool list_changed) OVERRIDE;
|
| + virtual void NetworkStateChanged(bool list_changed) override;
|
| virtual void NetworkServiceChanged(
|
| - const chromeos::NetworkState* network) OVERRIDE;
|
| + const chromeos::NetworkState* network) override;
|
|
|
| private:
|
| tray::VpnDefaultView* default_;
|
|
|