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

Side by Side Diff: ui/compositor/test/test_layer_animation_delegate.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_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_ 5 #ifndef UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_
6 #define UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_ 6 #define UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "ui/compositor/layer_animation_delegate.h" 9 #include "ui/compositor/layer_animation_delegate.h"
10 #include "ui/gfx/rect.h" 10 #include "ui/gfx/rect.h"
11 #include "ui/gfx/transform.h" 11 #include "ui/gfx/transform.h"
12 12
13 namespace ui { 13 namespace ui {
14 14
15 class TestLayerAnimationDelegate : public LayerAnimationDelegate { 15 class TestLayerAnimationDelegate : public LayerAnimationDelegate {
16 public: 16 public:
17 TestLayerAnimationDelegate(); 17 TestLayerAnimationDelegate();
18 explicit TestLayerAnimationDelegate(const LayerAnimationDelegate& other); 18 explicit TestLayerAnimationDelegate(const LayerAnimationDelegate& other);
19 virtual ~TestLayerAnimationDelegate(); 19 virtual ~TestLayerAnimationDelegate();
20 20
21 // Implementation of LayerAnimationDelegate 21 // Implementation of LayerAnimationDelegate
22 virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) OVERRIDE; 22 virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) override;
23 virtual void SetTransformFromAnimation( 23 virtual void SetTransformFromAnimation(
24 const gfx::Transform& transform) OVERRIDE; 24 const gfx::Transform& transform) override;
25 virtual void SetOpacityFromAnimation(float opacity) OVERRIDE; 25 virtual void SetOpacityFromAnimation(float opacity) override;
26 virtual void SetVisibilityFromAnimation(bool visibility) OVERRIDE; 26 virtual void SetVisibilityFromAnimation(bool visibility) override;
27 virtual void SetBrightnessFromAnimation(float brightness) OVERRIDE; 27 virtual void SetBrightnessFromAnimation(float brightness) override;
28 virtual void SetGrayscaleFromAnimation(float grayscale) OVERRIDE; 28 virtual void SetGrayscaleFromAnimation(float grayscale) override;
29 virtual void SetColorFromAnimation(SkColor color) OVERRIDE; 29 virtual void SetColorFromAnimation(SkColor color) override;
30 virtual void ScheduleDrawForAnimation() OVERRIDE; 30 virtual void ScheduleDrawForAnimation() override;
31 virtual const gfx::Rect& GetBoundsForAnimation() const OVERRIDE; 31 virtual const gfx::Rect& GetBoundsForAnimation() const override;
32 virtual gfx::Transform GetTransformForAnimation() const OVERRIDE; 32 virtual gfx::Transform GetTransformForAnimation() const override;
33 virtual float GetOpacityForAnimation() const OVERRIDE; 33 virtual float GetOpacityForAnimation() const override;
34 virtual bool GetVisibilityForAnimation() const OVERRIDE; 34 virtual bool GetVisibilityForAnimation() const override;
35 virtual float GetBrightnessForAnimation() const OVERRIDE; 35 virtual float GetBrightnessForAnimation() const override;
36 virtual float GetGrayscaleForAnimation() const OVERRIDE; 36 virtual float GetGrayscaleForAnimation() const override;
37 virtual SkColor GetColorForAnimation() const OVERRIDE; 37 virtual SkColor GetColorForAnimation() const override;
38 virtual float GetDeviceScaleFactor() const OVERRIDE; 38 virtual float GetDeviceScaleFactor() const override;
39 virtual void AddThreadedAnimation( 39 virtual void AddThreadedAnimation(
40 scoped_ptr<cc::Animation> animation) OVERRIDE; 40 scoped_ptr<cc::Animation> animation) override;
41 virtual void RemoveThreadedAnimation(int animation_id) OVERRIDE; 41 virtual void RemoveThreadedAnimation(int animation_id) override;
42 virtual LayerAnimatorCollection* GetLayerAnimatorCollection() OVERRIDE; 42 virtual LayerAnimatorCollection* GetLayerAnimatorCollection() override;
43 43
44 private: 44 private:
45 gfx::Rect bounds_; 45 gfx::Rect bounds_;
46 gfx::Transform transform_; 46 gfx::Transform transform_;
47 float opacity_; 47 float opacity_;
48 bool visibility_; 48 bool visibility_;
49 float brightness_; 49 float brightness_;
50 float grayscale_; 50 float grayscale_;
51 SkColor color_; 51 SkColor color_;
52 52
53 // Allow copy and assign. 53 // Allow copy and assign.
54 }; 54 };
55 55
56 } // namespace ui 56 } // namespace ui
57 57
58 #endif // UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_ 58 #endif // UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_
OLDNEW
« no previous file with comments | « ui/compositor/test/test_compositor_host_x11.cc ('k') | ui/compositor/test/test_layer_animation_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698