Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: ash/system/tray_update.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/tray_update.h ('k') | ash/system/user/accounts_detailed_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray_update.cc
diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc
index 79a3ad6abefb430150298aa8be2500745b0b0f21..4de9d1b86ded40749b41b965f21a4063d52d3fac 100644
--- a/ash/system/tray_update.cc
+++ b/ash/system/tray_update.cc
@@ -84,7 +84,7 @@ class UpdateView : public ash::ActionableView {
private:
// Overridden from ActionableView.
- virtual bool PerformAction(const ui::Event& event) OVERRIDE {
+ virtual bool PerformAction(const ui::Event& event) override {
ash::Shell::GetInstance()->
system_tray_delegate()->RequestRestartForUpdate();
return true;
@@ -131,7 +131,7 @@ class UpdateNagger : public ui::LayerAnimationObserver {
// Overridden from ui::LayerAnimationObserver.
virtual void OnLayerAnimationEnded(
- ui::LayerAnimationSequence* sequence) OVERRIDE {
+ ui::LayerAnimationSequence* sequence) override {
// TODO(oshima): Find out if the updator will be shown on non
// primary display.
if (Shell::GetPrimaryRootWindowController()->shelf()->IsVisible())
@@ -141,10 +141,10 @@ class UpdateNagger : public ui::LayerAnimationObserver {
}
virtual void OnLayerAnimationAborted(
- ui::LayerAnimationSequence* sequence) OVERRIDE {}
+ ui::LayerAnimationSequence* sequence) override {}
virtual void OnLayerAnimationScheduled(
- ui::LayerAnimationSequence* sequence) OVERRIDE {}
+ ui::LayerAnimationSequence* sequence) override {}
SystemTrayItem* owner_;
base::OneShotTimer<UpdateNagger> timer_;
« no previous file with comments | « ash/system/tray_update.h ('k') | ash/system/user/accounts_detailed_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698