mustash: Use ui::chromeos::EventRewriter in mus

services/ui/ws/display.cc

Index: services/ui/ws/display.cc
diff --git a/services/ui/ws/display.cc b/services/ui/ws/display.cc
index 7fc5771a689b12454b47d45b124b35f174ac2284..12b70fa3bd22f7a9ce246fa73415df6a81b80848 100644
--- a/services/ui/ws/display.cc
+++ b/services/ui/ws/display.cc
@@ -8,6 +8,7 @@
 #include <utility>
 #include <vector>
 
+#include "base/callback_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "services/service_manager/public/interfaces/connector.mojom.h"
@@ -260,6 +261,10 @@ ServerWindow* Display::GetRootWindow() {
   return root_.get();
 }
 
+EventSink* Display::GetEventSink() {
+  return this;
+}
+
 void Display::OnAcceleratedWidgetAvailable() {
   display_manager()->OnDisplayAcceleratedWidgetAvailable(this);
   InitWindowManagerDisplayRoots();
@@ -269,16 +274,6 @@ bool Display::IsInHighContrastMode() {
   return window_server_->IsActiveUserInHighContrastMode();
 }
 
-void Display::OnEvent(const ui::Event& event) {
-  WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
-  if (display_root)
-    display_root->window_manager_state()->ProcessEvent(event, GetId());
-  window_server_
-      ->GetUserActivityMonitorForUser(
-          window_server_->user_id_tracker()->active_id())
-      ->OnUserActivity();
-}
-
 void Display::OnNativeCaptureLost() {
   WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
   if (display_root)
@@ -386,5 +381,19 @@ void Display::OnWindowManagerWindowTreeFactoryReady(
     CreateWindowManagerDisplayRootFromFactory(factory);
 }
 
+EventDispatchDetails Display::OnEventFromSource(Event* event) {
+  WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
+  if (display_root) {
+    WindowManagerState* wm_state = display_root->window_manager_state();
+    wm_state->ProcessEvent(*event, GetId());
+  }
+
+  UserActivityMonitor* activity_monitor =
+      window_server_->GetUserActivityMonitorForUser(
+          window_server_->user_id_tracker()->active_id());
+  activity_monitor->OnUserActivity();
+  return EventDispatchDetails();
+}
+
 }  // namespace ws
 }  // namespace ui