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

Unified Diff: services/ui/ws/window_manager_state.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: pointer enter/exit; has_pointer_watcher etc Created 4 years, 4 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/window_manager_state.cc
diff --git a/services/ui/ws/window_manager_state.cc b/services/ui/ws/window_manager_state.cc
index f36ede01c8f64ed1d2d929863ee7c9650d5a0715..83797a6793e2a13d3be228b34748966a0b0eac07 100644
--- a/services/ui/ws/window_manager_state.cc
+++ b/services/ui/ws/window_manager_state.cc
@@ -241,7 +241,7 @@ void WindowManagerState::OnAcceleratorAck(mojom::EventResult result) {
} else {
// We're not going to process the event any further, notify event observers.
// We don't do this first to ensure we don't send an event twice to clients.
- window_server()->SendToEventObservers(*event, user_id(), nullptr);
+ window_server()->SendToPointerWatchers(*event, user_id(), nullptr);
ProcessNextEventFromQueue();
}
}
@@ -359,7 +359,7 @@ void WindowManagerState::DispatchInputEventToWindowImpl(
}
// Ignore |tree| because it will receive the event via normal dispatch.
- window_server()->SendToEventObservers(event, user_id(), tree);
+ window_server()->SendToPointerWatchers(event, user_id(), tree);
tree->DispatchInputEvent(target, event);
}
@@ -535,8 +535,8 @@ ServerWindow* WindowManagerState::GetRootWindowContaining(
}
void WindowManagerState::OnEventTargetNotFound(const ui::Event& event) {
- window_server()->SendToEventObservers(event, user_id(),
- nullptr /* ignore_tree */);
+ window_server()->SendToPointerWatchers(event, user_id(),
+ nullptr /* ignore_tree */);
}
} // namespace ws

Powered by Google App Engine
This is Rietveld 408576698