OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_ | 5 #ifndef UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_ |
6 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_ | 6 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_ |
7 | 7 |
| 8 #include "base/macros.h" |
8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
9 #include "ui/gfx/geometry/rect.h" | 10 #include "ui/gfx/geometry/rect.h" |
10 #include "ui/gfx/geometry/size.h" | 11 #include "ui/gfx/geometry/size.h" |
11 #include "ui/views/animation/ink_drop_animation_controller.h" | 12 #include "ui/views/animation/ink_drop_animation_controller.h" |
12 #include "ui/views/animation/ink_drop_animation_observer.h" | 13 #include "ui/views/animation/ink_drop_animation_observer.h" |
13 #include "ui/views/views_export.h" | 14 #include "ui/views/views_export.h" |
14 | 15 |
15 namespace views { | 16 namespace views { |
16 class InkDropAnimation; | 17 class InkDropAnimation; |
17 class InkDropHost; | 18 class InkDropHost; |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 // The current InkDropAnimation. Created on demand using | 72 // The current InkDropAnimation. Created on demand using |
72 // CreateInkDropAnimation(). | 73 // CreateInkDropAnimation(). |
73 scoped_ptr<InkDropAnimation> ink_drop_animation_; | 74 scoped_ptr<InkDropAnimation> ink_drop_animation_; |
74 | 75 |
75 DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerImpl); | 76 DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerImpl); |
76 }; | 77 }; |
77 | 78 |
78 } // namespace views | 79 } // namespace views |
79 | 80 |
80 #endif // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_ | 81 #endif // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_ |
OLD | NEW |