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

Unified Diff: ash/desktop_background/desktop_background_widget_controller.cc

Issue 680153002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix formatting 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
Index: ash/desktop_background/desktop_background_widget_controller.cc
diff --git a/ash/desktop_background/desktop_background_widget_controller.cc b/ash/desktop_background/desktop_background_widget_controller.cc
index cd90318bc39c2a85322816b398ee43c2357f39f5..72351c34c44fe14b4080567f8b90aca6aca3114c 100644
--- a/ash/desktop_background/desktop_background_widget_controller.cc
+++ b/ash/desktop_background/desktop_background_widget_controller.cc
@@ -30,7 +30,7 @@ class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver,
desktop_widget_->AddObserver(this);
}
- virtual ~ShowWallpaperAnimationObserver() {
+ ~ShowWallpaperAnimationObserver() override {
StopObservingImplicitAnimations();
if (desktop_widget_)
desktop_widget_->RemoveObserver(this);
@@ -38,22 +38,20 @@ class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver,
private:
// Overridden from ui::ImplicitAnimationObserver:
- virtual void OnImplicitAnimationsScheduled() override {
+ void OnImplicitAnimationsScheduled() override {
if (is_initial_animation_) {
root_window_controller_->
HandleInitialDesktopBackgroundAnimationStarted();
}
}
- virtual void OnImplicitAnimationsCompleted() override {
+ void OnImplicitAnimationsCompleted() override {
root_window_controller_->OnWallpaperAnimationFinished(desktop_widget_);
delete this;
}
// Overridden from views::WidgetObserver.
- virtual void OnWidgetDestroying(views::Widget* widget) override {
- delete this;
- }
+ void OnWidgetDestroying(views::Widget* widget) override { delete this; }
RootWindowController* root_window_controller_;
views::Widget* desktop_widget_;
« no previous file with comments | « ash/desktop_background/desktop_background_widget_controller.h ('k') | ash/desktop_background/wallpaper_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698