Changes ScreenMusDelegate::GetWindowAtScreenPoint to return aura::Window

ui/views/mus/window_manager_connection.cc

Index: ui/views/mus/window_manager_connection.cc
diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
index 48651f8e80db0c9d915a0a7ac25b8b02b6e9c6a0..f8f9b58aea677908d31bdbbe5dc04d817579eb7e 100644
--- a/ui/views/mus/window_manager_connection.cc
+++ b/ui/views/mus/window_manager_connection.cc
@@ -71,6 +71,16 @@ ui::Window* GetWindowFrom(const std::map<int64_t, gfx::Point>& display_origins,
   return nullptr;
 }
 
+aura::Window* GetAuraWindowFromUiWindow(ui::Window* window) {
+  if (!window)
+    return nullptr;
+  NativeWidgetMus* nw_mus = NativeWidgetMus::GetForWindow(window);
+  return nw_mus
+             ? static_cast<internal::NativeWidgetPrivate*>(nw_mus)
+                   ->GetNativeView()
+             : nullptr;
+}
+
 }  // namespace
 
 WindowManagerConnection::~WindowManagerConnection() {
@@ -171,6 +181,18 @@ WindowManagerConnection::WindowManagerConnection(
       std::map<std::string, std::vector<uint8_t>>()));
 }
 
+ui::Window* WindowManagerConnection::GetUiWindowAtScreenPoint(
+    const gfx::Point& point) {
+  std::map<int64_t, gfx::Point> display_origins;
+  for (display::Display& d : display::Screen::GetScreen()->GetAllDisplays())
+    display_origins[d.id()] = d.bounds().origin();
+
+  const std::set<ui::Window*>& roots = GetRoots();
+  std::vector<ui::Window*> windows;
+  std::copy(roots.begin(), roots.end(), std::back_inserter(windows));
+  return GetWindowFrom(display_origins, windows, point);
+}
+
 void WindowManagerConnection::OnEmbed(ui::Window* root) {}
 
 void WindowManagerConnection::OnLostConnection(ui::WindowTreeClient* client) {
@@ -199,16 +221,9 @@ gfx::Point WindowManagerConnection::GetCursorScreenPoint() {
   return client_->GetCursorScreenPoint();
 }
 
-ui::Window* WindowManagerConnection::GetWindowAtScreenPoint(
+aura::Window* WindowManagerConnection::GetWindowAtScreenPoint(
     const gfx::Point& point) {
-  std::map<int64_t, gfx::Point> display_origins;
-  for (display::Display& d : display::Screen::GetScreen()->GetAllDisplays())
-    display_origins[d.id()] = d.bounds().origin();
-
-  const std::set<ui::Window*>& roots = GetRoots();
-  std::vector<ui::Window*> windows;
-  std::copy(roots.begin(), roots.end(), std::back_inserter(windows));
-  return GetWindowFrom(display_origins, windows, point);
+  return GetAuraWindowFromUiWindow(GetUiWindowAtScreenPoint(point));
 }
 
 std::unique_ptr<OSExchangeData::Provider>