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_HOST_H_ | 5 #ifndef UI_VIEWS_ANIMATION_INK_DROP_HOST_H_ |
6 #define UI_VIEWS_ANIMATION_INK_DROP_HOST_H_ | 6 #define UI_VIEWS_ANIMATION_INK_DROP_HOST_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "ui/gfx/geometry/point.h" | 11 #include "ui/gfx/geometry/point.h" |
11 #include "ui/views/views_export.h" | 12 #include "ui/views/views_export.h" |
12 | 13 |
13 namespace ui { | 14 namespace ui { |
14 class Layer; | 15 class Layer; |
15 } // namespace ui | 16 } // namespace ui |
16 | 17 |
17 namespace views { | 18 namespace views { |
18 | 19 |
19 class InkDropAnimation; | 20 class InkDropAnimation; |
(...skipping 11 matching lines...) Expand all Loading... |
31 InkDropHost() {} | 32 InkDropHost() {} |
32 virtual ~InkDropHost() {} | 33 virtual ~InkDropHost() {} |
33 | 34 |
34 // Adds the |ink_drop_layer| in to a visible layer tree. | 35 // Adds the |ink_drop_layer| in to a visible layer tree. |
35 virtual void AddInkDropLayer(ui::Layer* ink_drop_layer) = 0; | 36 virtual void AddInkDropLayer(ui::Layer* ink_drop_layer) = 0; |
36 | 37 |
37 // Removes |ink_drop_layer| from the layer tree. | 38 // Removes |ink_drop_layer| from the layer tree. |
38 virtual void RemoveInkDropLayer(ui::Layer* ink_drop_layer) = 0; | 39 virtual void RemoveInkDropLayer(ui::Layer* ink_drop_layer) = 0; |
39 | 40 |
40 // Creates and returns the effect used for press. | 41 // Creates and returns the effect used for press. |
41 virtual scoped_ptr<InkDropAnimation> CreateInkDropAnimation() const = 0; | 42 virtual std::unique_ptr<InkDropAnimation> CreateInkDropAnimation() const = 0; |
42 | 43 |
43 // Creates and returns the effect used for hover. | 44 // Creates and returns the effect used for hover. |
44 virtual scoped_ptr<InkDropHover> CreateInkDropHover() const = 0; | 45 virtual std::unique_ptr<InkDropHover> CreateInkDropHover() const = 0; |
45 | 46 |
46 private: | 47 private: |
47 DISALLOW_COPY_AND_ASSIGN(InkDropHost); | 48 DISALLOW_COPY_AND_ASSIGN(InkDropHost); |
48 }; | 49 }; |
49 | 50 |
50 } // namespace views | 51 } // namespace views |
51 | 52 |
52 #endif // UI_VIEWS_ANIMATION_INK_DROP_HOST_H_ | 53 #endif // UI_VIEWS_ANIMATION_INK_DROP_HOST_H_ |
OLD | NEW |