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

Unified Diff: services/ui/ws/test_utils.cc

Issue 2183163002: mus: Change PointerWatcher to observe all pointer events, with moves optional. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Event conversion; comments; rebase Created 4 years, 5 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
Index: services/ui/ws/test_utils.cc
diff --git a/services/ui/ws/test_utils.cc b/services/ui/ws/test_utils.cc
index 795954c86a95926fc5f43362cb8633b39560126e..7ae92cb643746c219ec5bfd49c2751f42635e7a8 100644
--- a/services/ui/ws/test_utils.cc
+++ b/services/ui/ws/test_utils.cc
@@ -138,9 +138,13 @@ const ViewportMetrics& TestFrameGeneratorDelegate::GetViewportMetrics() {
WindowTreeTestApi::WindowTreeTestApi(WindowTree* tree) : tree_(tree) {}
WindowTreeTestApi::~WindowTreeTestApi() {}
-void WindowTreeTestApi::SetEventObserver(mojom::EventMatcherPtr matcher,
- uint32_t event_observer_id) {
- tree_->SetEventObserver(std::move(matcher), event_observer_id);
+void WindowTreeTestApi::StartPointerWatcher(bool want_moves,
+ uint32_t pointer_watcher_id) {
+ tree_->StartPointerWatcher(want_moves, pointer_watcher_id);
+}
+
+void WindowTreeTestApi::StopPointerWatcher() {
+ tree_->StopPointerWatcher();
}
// DisplayTestApi ------------------------------------------------------------
@@ -315,9 +319,10 @@ void TestWindowTreeClient::OnWindowInputEvent(uint32_t event_id,
tracker_.OnWindowInputEvent(window, *event.get(), event_observer_id);
}
-void TestWindowTreeClient::OnEventObserved(std::unique_ptr<ui::Event> event,
- uint32_t event_observer_id) {
- tracker_.OnEventObserved(*event.get(), event_observer_id);
+void TestWindowTreeClient::OnPointerWatcherEvent(
+ std::unique_ptr<ui::Event> event,
+ uint32_t event_observer_id) {
+ tracker_.OnPointerWatcherEvent(*event.get(), event_observer_id);
}
void TestWindowTreeClient::OnWindowFocused(uint32_t focused_window_id) {

Powered by Google App Engine
This is Rietveld 408576698