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

Side by Side Diff: ui/views/animation/bounds_animator.h

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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_ 5 #ifndef UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_
6 #define UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_ 6 #define UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // Used when changing the animation for a view. This resets the maps for 137 // Used when changing the animation for a view. This resets the maps for
138 // the animation used by view and returns the current animation. Ownership 138 // the animation used by view and returns the current animation. Ownership
139 // of the returned animation passes to the caller. 139 // of the returned animation passes to the caller.
140 gfx::Animation* ResetAnimationForView(View* view); 140 gfx::Animation* ResetAnimationForView(View* view);
141 141
142 // Invoked from AnimationEnded and AnimationCanceled. 142 // Invoked from AnimationEnded and AnimationCanceled.
143 void AnimationEndedOrCanceled(const gfx::Animation* animation, 143 void AnimationEndedOrCanceled(const gfx::Animation* animation,
144 AnimationEndType type); 144 AnimationEndType type);
145 145
146 // gfx::AnimationDelegate overrides. 146 // gfx::AnimationDelegate overrides.
147 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 147 virtual void AnimationProgressed(const gfx::Animation* animation) override;
148 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; 148 virtual void AnimationEnded(const gfx::Animation* animation) override;
149 virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE; 149 virtual void AnimationCanceled(const gfx::Animation* animation) override;
150 150
151 // gfx::AnimationContainerObserver overrides. 151 // gfx::AnimationContainerObserver overrides.
152 virtual void AnimationContainerProgressed( 152 virtual void AnimationContainerProgressed(
153 gfx::AnimationContainer* container) OVERRIDE; 153 gfx::AnimationContainer* container) override;
154 virtual void AnimationContainerEmpty( 154 virtual void AnimationContainerEmpty(
155 gfx::AnimationContainer* container) OVERRIDE; 155 gfx::AnimationContainer* container) override;
156 156
157 // Parent of all views being animated. 157 // Parent of all views being animated.
158 View* parent_; 158 View* parent_;
159 159
160 ObserverList<BoundsAnimatorObserver> observers_; 160 ObserverList<BoundsAnimatorObserver> observers_;
161 161
162 // All animations we create up with the same container. 162 // All animations we create up with the same container.
163 scoped_refptr<gfx::AnimationContainer> container_; 163 scoped_refptr<gfx::AnimationContainer> container_;
164 164
165 // Maps from view being animated to info about the view. 165 // Maps from view being animated to info about the view.
(...skipping 11 matching lines...) Expand all
177 int animation_duration_ms_; 177 int animation_duration_ms_;
178 178
179 gfx::Tween::Type tween_type_; 179 gfx::Tween::Type tween_type_;
180 180
181 DISALLOW_COPY_AND_ASSIGN(BoundsAnimator); 181 DISALLOW_COPY_AND_ASSIGN(BoundsAnimator);
182 }; 182 };
183 183
184 } // namespace views 184 } // namespace views
185 185
186 #endif // UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_ 186 #endif // UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_
OLDNEW
« no previous file with comments | « ui/views/accessible_pane_view_unittest.cc ('k') | ui/views/animation/bounds_animator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698