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

Unified Diff: ui/views/animation/test/ink_drop_host_view_test_api.cc

Issue 2070143003: Add MD ink drop ripple to app list button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@b612539_shelf_button_ripple
Patch Set: Rebased Created 4 years, 6 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/test/ink_drop_host_view_test_api.h ('k') | ui/views/controls/button/custom_button.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_host_view_test_api.cc
diff --git a/ui/views/animation/test/ink_drop_host_view_test_api.cc b/ui/views/animation/test/ink_drop_host_view_test_api.cc
index 42b5116fb88af37315d9b9cd07999efdd7c25b66..2cd524ae2f6d92dff27abfbf6865899bed6c7ea7 100644
--- a/ui/views/animation/test/ink_drop_host_view_test_api.cc
+++ b/ui/views/animation/test/ink_drop_host_view_test_api.cc
@@ -12,15 +12,22 @@ InkDropHostViewTestApi::InkDropHostViewTestApi(InkDropHostView* host_view)
InkDropHostViewTestApi::~InkDropHostViewTestApi() {}
-void InkDropHostViewTestApi::SetHasInkDrop(bool has_an_ink_drop) {
- host_view_->SetHasInkDrop(has_an_ink_drop);
+void InkDropHostViewTestApi::SetInkDropMode(InkDropMode ink_dorp_mode) {
+ host_view_->SetInkDropMode(ink_dorp_mode);
}
-void InkDropHostViewTestApi::SetInkDrop(std::unique_ptr<InkDrop> ink_drop) {
- host_view_->SetHasInkDrop(true);
+void InkDropHostViewTestApi::SetInkDrop(std::unique_ptr<InkDrop> ink_drop,
+ bool handles_gesture_events) {
+ host_view_->SetInkDropMode(handles_gesture_events
+ ? InkDropMode::ON
+ : InkDropMode::ON_NO_GESTURE_HANDLER);
host_view_->ink_drop_ = std::move(ink_drop);
}
+void InkDropHostViewTestApi::SetInkDrop(std::unique_ptr<InkDrop> ink_drop) {
+ SetInkDrop(std::move(ink_drop), true);
+}
+
bool InkDropHostViewTestApi::HasGestureHandler() const {
return host_view_->gesture_handler_ != nullptr;
}
« no previous file with comments | « ui/views/animation/test/ink_drop_host_view_test_api.h ('k') | ui/views/controls/button/custom_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698