| Index: ash/system/chromeos/power/tray_power.h
|
| diff --git a/ash/system/chromeos/power/tray_power.h b/ash/system/chromeos/power/tray_power.h
|
| index 92f4a5531a140bcc2d517c1bf9f752df60abe727..c8ae131ebd4f90f45c7007dcdb67d043a31ec374 100644
|
| --- a/ash/system/chromeos/power/tray_power.h
|
| +++ b/ash/system/chromeos/power/tray_power.h
|
| @@ -51,7 +51,7 @@ class ASH_EXPORT TrayPower : public SystemTrayItem,
|
|
|
| TrayPower(SystemTray* system_tray,
|
| message_center::MessageCenter* message_center);
|
| - virtual ~TrayPower();
|
| + ~TrayPower() override;
|
|
|
| private:
|
| friend class TrayPowerTest;
|
| @@ -68,19 +68,17 @@ class ASH_EXPORT TrayPower : public SystemTrayItem,
|
| };
|
|
|
| // Overridden from SystemTrayItem.
|
| - virtual views::View* CreateTrayView(user::LoginStatus status) override;
|
| - virtual views::View* CreateDefaultView(user::LoginStatus status) override;
|
| - virtual views::View* CreateNotificationView(
|
| - user::LoginStatus status) override;
|
| - virtual void DestroyTrayView() override;
|
| - virtual void DestroyDefaultView() override;
|
| - virtual void DestroyNotificationView() override;
|
| - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
|
| - virtual void UpdateAfterShelfAlignmentChange(
|
| - ShelfAlignment alignment) override;
|
| + views::View* CreateTrayView(user::LoginStatus status) override;
|
| + views::View* CreateDefaultView(user::LoginStatus status) override;
|
| + views::View* CreateNotificationView(user::LoginStatus status) override;
|
| + void DestroyTrayView() override;
|
| + void DestroyDefaultView() override;
|
| + void DestroyNotificationView() override;
|
| + void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
|
| + void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
|
|
|
| // Overridden from PowerStatus::Observer.
|
| - virtual void OnPowerStatusChanged() override;
|
| + void OnPowerStatusChanged() override;
|
|
|
| // Show a notification that a low-power USB charger has been connected.
|
| // Returns true if a notification was shown or explicitly hidden.
|
|
|