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

Unified Diff: ash/wm/session_state_animator_impl.cc

Issue 645513008: Standardize usage of virtual/override/final specifiers. (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/wm/session_state_animator_impl.h ('k') | ash/wm/stacking_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/session_state_animator_impl.cc
diff --git a/ash/wm/session_state_animator_impl.cc b/ash/wm/session_state_animator_impl.cc
index 274b5e46d3b1a78069904121d0d11c57a76dcafc..e606953619e1a8e920a0b4a0eab4bc7f8b6cf3e9 100644
--- a/ash/wm/session_state_animator_impl.cc
+++ b/ash/wm/session_state_animator_impl.cc
@@ -295,27 +295,23 @@ class CallbackAnimationObserver : public ui::LayerAnimationObserver {
explicit CallbackAnimationObserver(base::Closure callback)
: callback_(callback) {
}
- virtual ~CallbackAnimationObserver() {
- }
+ ~CallbackAnimationObserver() override {}
private:
// Overridden from ui::LayerAnimationObserver:
- virtual void OnLayerAnimationEnded(ui::LayerAnimationSequence* seq)
- override {
+ void OnLayerAnimationEnded(ui::LayerAnimationSequence* seq) override {
// Drop foreground once animation is over.
callback_.Run();
delete this;
}
- virtual void OnLayerAnimationAborted(ui::LayerAnimationSequence* seq)
- override {
+ void OnLayerAnimationAborted(ui::LayerAnimationSequence* seq) override {
// Drop foreground once animation is over.
callback_.Run();
delete this;
}
- virtual void OnLayerAnimationScheduled(ui::LayerAnimationSequence* seq)
- override {}
+ void OnLayerAnimationScheduled(ui::LayerAnimationSequence* seq) override {}
base::Closure callback_;
@@ -418,36 +414,32 @@ class SessionStateAnimatorImpl::AnimationSequence
}
// SessionStateAnimator::AnimationSequence:
- virtual void StartAnimation(
- int container_mask,
- SessionStateAnimator::AnimationType type,
- SessionStateAnimator::AnimationSpeed speed) override {
+ void StartAnimation(int container_mask,
+ SessionStateAnimator::AnimationType type,
+ SessionStateAnimator::AnimationSpeed speed) override {
animator_->StartAnimationInSequence(container_mask, type, speed, this);
}
private:
- virtual ~AnimationSequence() {}
+ ~AnimationSequence() override {}
// ui::LayerAnimationObserver:
- virtual void OnLayerAnimationEnded(
- ui::LayerAnimationSequence* sequence) override {
+ void OnLayerAnimationEnded(ui::LayerAnimationSequence* sequence) override {
sequences_completed_++;
if (sequences_completed_ == sequences_attached_)
OnAnimationCompleted();
}
- virtual void OnLayerAnimationAborted(
- ui::LayerAnimationSequence* sequence) override {
+ void OnLayerAnimationAborted(ui::LayerAnimationSequence* sequence) override {
sequences_completed_++;
if (sequences_completed_ == sequences_attached_)
OnAnimationAborted();
}
- virtual void OnLayerAnimationScheduled(
+ void OnLayerAnimationScheduled(
ui::LayerAnimationSequence* sequence) override {}
- virtual void OnAttachedToSequence(
- ui::LayerAnimationSequence* sequence) override {
+ void OnAttachedToSequence(ui::LayerAnimationSequence* sequence) override {
LayerAnimationObserver::OnAttachedToSequence(sequence);
sequences_attached_++;
}
« no previous file with comments | « ash/wm/session_state_animator_impl.h ('k') | ash/wm/stacking_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698