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_HOVER_H_ | 5 #ifndef UI_VIEWS_ANIMATION_INK_DROP_HOVER_H_ |
6 #define UI_VIEWS_ANIMATION_INK_DROP_HOVER_H_ | 6 #define UI_VIEWS_ANIMATION_INK_DROP_HOVER_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 "base/time/time.h" | 11 #include "base/time/time.h" |
11 #include "third_party/skia/include/core/SkColor.h" | 12 #include "third_party/skia/include/core/SkColor.h" |
12 #include "ui/gfx/geometry/point.h" | 13 #include "ui/gfx/geometry/point.h" |
13 #include "ui/gfx/geometry/size.h" | 14 #include "ui/gfx/geometry/size.h" |
14 #include "ui/views/views_export.h" | 15 #include "ui/views/views_export.h" |
15 | 16 |
16 namespace ui { | 17 namespace ui { |
17 class Layer; | 18 class Layer; |
18 class CallbackLayerAnimationObserver; | 19 class CallbackLayerAnimationObserver; |
19 } // namespace ui | 20 } // namespace ui |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 // The callback that will be invoked when a fade in/out animation is complete. | 56 // The callback that will be invoked when a fade in/out animation is complete. |
56 bool AnimationEndedCallback( | 57 bool AnimationEndedCallback( |
57 HoverAnimationType animation_type, | 58 HoverAnimationType animation_type, |
58 const ui::CallbackLayerAnimationObserver& observer); | 59 const ui::CallbackLayerAnimationObserver& observer); |
59 | 60 |
60 // True if the last animation to be initiated was a FADE_IN, and false | 61 // True if the last animation to be initiated was a FADE_IN, and false |
61 // otherwise. | 62 // otherwise. |
62 bool last_animation_initiated_was_fade_in_; | 63 bool last_animation_initiated_was_fade_in_; |
63 | 64 |
64 // The LayerDelegate that paints the hover |layer_|. | 65 // The LayerDelegate that paints the hover |layer_|. |
65 scoped_ptr<RoundedRectangleLayerDelegate> layer_delegate_; | 66 std::unique_ptr<RoundedRectangleLayerDelegate> layer_delegate_; |
66 | 67 |
67 // The visual hover layer that is painted by |layer_delegate_|. | 68 // The visual hover layer that is painted by |layer_delegate_|. |
68 scoped_ptr<ui::Layer> layer_; | 69 std::unique_ptr<ui::Layer> layer_; |
69 | 70 |
70 DISALLOW_COPY_AND_ASSIGN(InkDropHover); | 71 DISALLOW_COPY_AND_ASSIGN(InkDropHover); |
71 }; | 72 }; |
72 | 73 |
73 } // namespace views | 74 } // namespace views |
74 | 75 |
75 #endif // UI_VIEWS_ANIMATION_INK_DROP_HOVER_H_ | 76 #endif // UI_VIEWS_ANIMATION_INK_DROP_HOVER_H_ |
OLD | NEW |