summaryrefslogtreecommitdiffstats
path: root/ash/system/chromeos/power/tray_power.h
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-03 09:23:45 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-03 16:24:05 +0000
commit10d6b38a855066b1400d96d0600c6e2aec42cbf1 (patch)
tree8df573d9a31973c64cd9c50e9a2a6a6fa5c49e82 /ash/system/chromeos/power/tray_power.h
parent90b32ca95485409ba5646c96a4ec0aa4b6216aee (diff)
downloadchromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.zip
chromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.tar.gz
chromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.tar.bz2
replace OVERRIDE and FINAL with override and final in ash/
BUG=417463 Review URL: https://codereview.chromium.org/621133002 Cr-Commit-Position: refs/heads/master@{#298040}
Diffstat (limited to 'ash/system/chromeos/power/tray_power.h')
-rw-r--r--ash/system/chromeos/power/tray_power.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/ash/system/chromeos/power/tray_power.h b/ash/system/chromeos/power/tray_power.h
index 3bd0b20..a0623fc 100644
--- a/ash/system/chromeos/power/tray_power.h
+++ b/ash/system/chromeos/power/tray_power.h
@@ -68,19 +68,19 @@ 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* 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;
+ 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;
+ ShelfAlignment alignment) override;
// Overridden from PowerStatus::Observer.
- virtual void OnPowerStatusChanged() OVERRIDE;
+ virtual 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.