Index: ui/app_list/views/apps_grid_view.cc |
diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc |
index 8d37d6a4397942ca9112aa9edce3f0b8f29db6cc..75f954561cc8ae402aab9085c54d6af2504b9706 100644 |
--- a/ui/app_list/views/apps_grid_view.cc |
+++ b/ui/app_list/views/apps_grid_view.cc |
@@ -134,10 +134,10 @@ class RowMoveAnimationDelegate : public gfx::AnimationDelegate { |
layer_start_(layer ? layer->bounds() : gfx::Rect()), |
layer_target_(layer_target) { |
} |
- virtual ~RowMoveAnimationDelegate() {} |
+ ~RowMoveAnimationDelegate() override {} |
// gfx::AnimationDelegate overrides: |
- virtual void AnimationProgressed(const gfx::Animation* animation) override { |
+ void AnimationProgressed(const gfx::Animation* animation) override { |
view_->layer()->SetOpacity(animation->GetCurrentValue()); |
view_->layer()->ScheduleDraw(); |
@@ -148,11 +148,11 @@ class RowMoveAnimationDelegate : public gfx::AnimationDelegate { |
layer_->ScheduleDraw(); |
} |
} |
- virtual void AnimationEnded(const gfx::Animation* animation) override { |
+ void AnimationEnded(const gfx::Animation* animation) override { |
view_->layer()->SetOpacity(1.0f); |
view_->SchedulePaint(); |
} |
- virtual void AnimationCanceled(const gfx::Animation* animation) override { |
+ void AnimationCanceled(const gfx::Animation* animation) override { |
view_->layer()->SetOpacity(1.0f); |
view_->SchedulePaint(); |
} |
@@ -177,11 +177,10 @@ class ItemRemoveAnimationDelegate : public gfx::AnimationDelegate { |
: view_(view) { |
} |
- virtual ~ItemRemoveAnimationDelegate() { |
- } |
+ ~ItemRemoveAnimationDelegate() override {} |
// gfx::AnimationDelegate overrides: |
- virtual void AnimationProgressed(const gfx::Animation* animation) override { |
+ void AnimationProgressed(const gfx::Animation* animation) override { |
view_->layer()->SetOpacity(1 - animation->GetCurrentValue()); |
view_->layer()->ScheduleDraw(); |
} |
@@ -199,10 +198,10 @@ class ItemMoveAnimationDelegate : public gfx::AnimationDelegate { |
public: |
ItemMoveAnimationDelegate(views::View* view) : view_(view) {} |
- virtual void AnimationEnded(const gfx::Animation* animation) override { |
+ void AnimationEnded(const gfx::Animation* animation) override { |
view_->SchedulePaint(); |
} |
- virtual void AnimationCanceled(const gfx::Animation* animation) override { |
+ void AnimationCanceled(const gfx::Animation* animation) override { |
view_->SchedulePaint(); |
} |