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

Unified Diff: ui/views/animation/test/ink_drop_impl_test_api.h

Issue 1937353002: Rename of InkDropAnimationController classes to InkDrop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed tdanderson@ comments from patch set 2. Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/animation/ink_drop_impl_unittest.cc ('k') | ui/views/animation/test/ink_drop_impl_test_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/test/ink_drop_impl_test_api.h
diff --git a/ui/views/animation/test/ink_drop_hover_test_api.h b/ui/views/animation/test/ink_drop_impl_test_api.h
similarity index 52%
copy from ui/views/animation/test/ink_drop_hover_test_api.h
copy to ui/views/animation/test/ink_drop_impl_test_api.h
index 07f24b552c18aaa3e73b9ebdef7ccff3920b9cab..556d28eae8734da06c979fbbf7b1bda820e58959 100644
--- a/ui/views/animation/test/ink_drop_hover_test_api.h
+++ b/ui/views/animation/test/ink_drop_impl_test_api.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_VIEWS_ANIMATION_TEST_INK_DROP_HOVER_TEST_API_H_
-#define UI_VIEWS_ANIMATION_TEST_INK_DROP_HOVER_TEST_API_H_
+#ifndef UI_VIEWS_ANIMATION_TEST_INK_DROP_IMPL_TEST_API_H_
+#define UI_VIEWS_ANIMATION_TEST_INK_DROP_IMPL_TEST_API_H_
#include <vector>
@@ -16,38 +16,37 @@ class LayerAnimator;
} // namespace ui
namespace views {
+class InkDropImpl;
class InkDropHover;
namespace test {
-// Test API to provide internal access to an InkDropHover instance. This can
-// also be used to control the animations via the
+// Test API to provide internal access to an InkDropImpl instance. This can also
+// be used to control the InkDropRipple and InkDropHover animations via the
// ui::test::MultiLayerAnimatorTestController API.
-class InkDropHoverTestApi
+class InkDropImplTestApi
: public ui::test::MultiLayerAnimatorTestController,
public ui::test::MultiLayerAnimatorTestControllerDelegate {
public:
- explicit InkDropHoverTestApi(InkDropHover* ink_drop_hover);
- ~InkDropHoverTestApi() override;
+ explicit InkDropImplTestApi(InkDropImpl* ink_drop_controller_);
+ ~InkDropImplTestApi() override;
- // MultiLayerAnimatorTestControllerDelegate:
- std::vector<ui::LayerAnimator*> GetLayerAnimators() override;
+ // Wrappers to InkDropImpl internals:
+ const InkDropHover* hover() const;
+ bool IsHoverFadingInOrVisible() const;
protected:
- InkDropHover* ink_drop_hover() {
- return static_cast<const InkDropHoverTestApi*>(this)->ink_drop_hover();
- }
-
- InkDropHover* ink_drop_hover() const { return ink_drop_hover_; }
+ // MultiLayerAnimatorTestControllerDelegate:
+ std::vector<ui::LayerAnimator*> GetLayerAnimators() override;
private:
- // The InkDropedAnimation to provide internal access to.
- InkDropHover* ink_drop_hover_;
+ // The InkDrop to provide internal access to.
+ InkDropImpl* ink_drop_;
- DISALLOW_COPY_AND_ASSIGN(InkDropHoverTestApi);
+ DISALLOW_COPY_AND_ASSIGN(InkDropImplTestApi);
};
} // namespace test
} // namespace views
-#endif // UI_VIEWS_ANIMATION_TEST_INK_DROP_HOVER_TEST_API_H_
+#endif // UI_VIEWS_ANIMATION_TEST_INK_DROP_IMPL_TEST_API_H_
« no previous file with comments | « ui/views/animation/ink_drop_impl_unittest.cc ('k') | ui/views/animation/test/ink_drop_impl_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698