Chromium Code Reviews| 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 <iosfwd> | |
| 8 #include <memory> | 9 #include <memory> |
| 9 | 10 |
| 10 #include "base/macros.h" | 11 #include "base/macros.h" |
| 11 #include "base/time/time.h" | 12 #include "base/time/time.h" |
| 12 #include "third_party/skia/include/core/SkColor.h" | 13 #include "third_party/skia/include/core/SkColor.h" |
| 13 #include "ui/gfx/geometry/point.h" | 14 #include "ui/gfx/geometry/point.h" |
| 14 #include "ui/gfx/geometry/point_f.h" | 15 #include "ui/gfx/geometry/point_f.h" |
| 15 #include "ui/gfx/geometry/size.h" | 16 #include "ui/gfx/geometry/size.h" |
| 16 #include "ui/gfx/transform.h" | 17 #include "ui/gfx/transform.h" |
| 17 #include "ui/views/views_export.h" | 18 #include "ui/views/views_export.h" |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 106 std::unique_ptr<RoundedRectangleLayerDelegate> layer_delegate_; | 107 std::unique_ptr<RoundedRectangleLayerDelegate> layer_delegate_; |
| 107 | 108 |
| 108 // The visual hover layer that is painted by |layer_delegate_|. | 109 // The visual hover layer that is painted by |layer_delegate_|. |
| 109 std::unique_ptr<ui::Layer> layer_; | 110 std::unique_ptr<ui::Layer> layer_; |
| 110 | 111 |
| 111 InkDropHoverObserver* observer_; | 112 InkDropHoverObserver* observer_; |
| 112 | 113 |
| 113 DISALLOW_COPY_AND_ASSIGN(InkDropHover); | 114 DISALLOW_COPY_AND_ASSIGN(InkDropHover); |
| 114 }; | 115 }; |
| 115 | 116 |
| 117 // Returns a human readable string for |animation_type|. Useful for logging. | |
| 118 VIEWS_EXPORT std::string ToString( | |
| 119 const InkDropHover::AnimationType& animation_type); | |
|
sky
2016/05/04 23:43:42
Same comment here.
bruthig
2016/05/04 23:51:48
Done.
| |
| 120 | |
| 121 // This is declared here for use in gtest-based unit tests but is defined in | |
| 122 // the views_test_support target. Depend on that to use this in your unit test. | |
| 123 // This should not be used in production code - call ToString() instead. | |
| 124 void PrintTo(const InkDropHover::AnimationType& animation_type, | |
|
sky
2016/05/04 23:43:42
and here.
bruthig
2016/05/04 23:51:48
Done.
| |
| 125 ::std::ostream* os); | |
| 126 | |
| 116 } // namespace views | 127 } // namespace views |
| 117 | 128 |
| 118 #endif // UI_VIEWS_ANIMATION_INK_DROP_HOVER_H_ | 129 #endif // UI_VIEWS_ANIMATION_INK_DROP_HOVER_H_ |
| OLD | NEW |