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

Unified Diff: ui/app_list/views/apps_grid_view.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/app_list/views/apps_grid_view.h ('k') | ui/app_list/views/apps_grid_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 53b365d8b089e56d8fc472a12f96cd4f370e3d73..1c24bf5cbca26d2a0663c88bf8f78e7d5b129690 100644
--- a/ui/app_list/views/apps_grid_view.cc
+++ b/ui/app_list/views/apps_grid_view.cc
@@ -137,7 +137,7 @@ class RowMoveAnimationDelegate : public gfx::AnimationDelegate {
virtual ~RowMoveAnimationDelegate() {}
// gfx::AnimationDelegate overrides:
- virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE {
+ virtual 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 {
+ virtual void AnimationEnded(const gfx::Animation* animation) override {
view_->layer()->SetOpacity(1.0f);
view_->SchedulePaint();
}
- virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE {
+ virtual void AnimationCanceled(const gfx::Animation* animation) override {
view_->layer()->SetOpacity(1.0f);
view_->SchedulePaint();
}
@@ -181,7 +181,7 @@ class ItemRemoveAnimationDelegate : public gfx::AnimationDelegate {
}
// gfx::AnimationDelegate overrides:
- virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE {
+ virtual void AnimationProgressed(const gfx::Animation* animation) override {
view_->layer()->SetOpacity(1 - animation->GetCurrentValue());
view_->layer()->ScheduleDraw();
}
@@ -199,10 +199,10 @@ class ItemMoveAnimationDelegate : public gfx::AnimationDelegate {
public:
ItemMoveAnimationDelegate(views::View* view) : view_(view) {}
- virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE {
+ virtual void AnimationEnded(const gfx::Animation* animation) override {
view_->SchedulePaint();
}
- virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE {
+ virtual void AnimationCanceled(const gfx::Animation* animation) override {
view_->SchedulePaint();
}
@@ -301,14 +301,14 @@ class SynchronousDrag : public ui::DragSourceWin {
private:
// Overridden from ui::DragSourceWin.
- virtual void OnDragSourceCancel() OVERRIDE {
+ virtual void OnDragSourceCancel() override {
canceled_ = true;
}
- virtual void OnDragSourceDrop() OVERRIDE {
+ virtual void OnDragSourceDrop() override {
}
- virtual void OnDragSourceMove() OVERRIDE {
+ virtual void OnDragSourceMove() override {
grid_view_->UpdateDrag(AppsGridView::MOUSE, GetCursorInGridViewCoords());
}
« no previous file with comments | « ui/app_list/views/apps_grid_view.h ('k') | ui/app_list/views/apps_grid_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698