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

Side by Side Diff: ui/compositor/float_animation_curve_adapter.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
« no previous file with comments | « ui/compositor/compositor.h ('k') | ui/compositor/layer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_COMPOSITOR_FLOAT_ANIMATION_CURVE_ADAPTER_H_ 5 #ifndef UI_COMPOSITOR_FLOAT_ANIMATION_CURVE_ADAPTER_H_
6 #define UI_COMPOSITOR_FLOAT_ANIMATION_CURVE_ADAPTER_H_ 6 #define UI_COMPOSITOR_FLOAT_ANIMATION_CURVE_ADAPTER_H_
7 7
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "cc/animation/animation_curve.h" 9 #include "cc/animation/animation_curve.h"
10 #include "ui/gfx/animation/tween.h" 10 #include "ui/gfx/animation/tween.h"
11 11
12 namespace ui { 12 namespace ui {
13 13
14 class FloatAnimationCurveAdapter : public cc::FloatAnimationCurve { 14 class FloatAnimationCurveAdapter : public cc::FloatAnimationCurve {
15 public: 15 public:
16 FloatAnimationCurveAdapter(gfx::Tween::Type tween_type, 16 FloatAnimationCurveAdapter(gfx::Tween::Type tween_type,
17 float initial_value, 17 float initial_value,
18 float target_value, 18 float target_value,
19 base::TimeDelta duration); 19 base::TimeDelta duration);
20 20
21 virtual ~FloatAnimationCurveAdapter() { } 21 virtual ~FloatAnimationCurveAdapter() { }
22 22
23 // FloatAnimationCurve implementation. 23 // FloatAnimationCurve implementation.
24 virtual double Duration() const OVERRIDE; 24 virtual double Duration() const override;
25 virtual scoped_ptr<cc::AnimationCurve> Clone() const OVERRIDE; 25 virtual scoped_ptr<cc::AnimationCurve> Clone() const override;
26 virtual float GetValue(double t) const OVERRIDE; 26 virtual float GetValue(double t) const override;
27 27
28 private: 28 private:
29 gfx::Tween::Type tween_type_; 29 gfx::Tween::Type tween_type_;
30 float initial_value_; 30 float initial_value_;
31 float target_value_; 31 float target_value_;
32 base::TimeDelta duration_; 32 base::TimeDelta duration_;
33 }; 33 };
34 34
35 } // namespace ui 35 } // namespace ui
36 36
37 #endif // UI_COMPOSITOR_FLOAT_ANIMATION_CURVE_ADAPTER_H_ 37 #endif // UI_COMPOSITOR_FLOAT_ANIMATION_CURVE_ADAPTER_H_
OLDNEW
« no previous file with comments | « ui/compositor/compositor.h ('k') | ui/compositor/layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698