Changes ScreenMusDelegate::GetWindowAtScreenPoint to return aura::Window

ui/views/mus/screen_mus.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This has to be before any other includes, else default is picked up.
 // See base/logging for details on this.
 #define NOTIMPLEMENTED_POLICY 5
 
 #include "ui/views/mus/screen_mus.h"
 
@@ skipping 63 matching lines @@
   }
 
   return delegate_->GetCursorScreenPoint();
 }
 
 bool ScreenMus::IsWindowUnderCursor(gfx::NativeWindow window) {
   return window && window->IsVisible() &&
          window->GetBoundsInScreen().Contains(GetCursorScreenPoint());
 }
 
-gfx::NativeWindow ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) {
-  aura::Window* aura_window = nullptr;
-  ui::Window* ui_window = delegate_->GetWindowAtScreenPoint(point);
-  if (ui_window) {
-    NativeWidgetMus* nw_mus = NativeWidgetMus::GetForWindow(ui_window);
-    if (nw_mus) {
-      aura_window =
-          static_cast<internal::NativeWidgetPrivate*>(nw_mus)->GetNativeView();
-    }
-  }
-  return aura_window;
+aura::Window* ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) {
+  return delegate_->GetWindowAtScreenPoint(point);
 }
 
 void ScreenMus::OnDisplays(mojo::Array<ui::mojom::WsDisplayPtr> ws_displays,
                            int64_t primary_display_id,
                            int64_t internal_display_id) {
   // This should only be called once when ScreenMus is added as an observer.
   DCHECK(display_list()->displays().empty());
 
   for (size_t i = 0; i < ws_displays.size(); ++i) {
     const display::Display& display = ws_displays[i]->display;
@@ skipping 44 matching lines @@
   // TODO(kylechar): DisplayList would need to change to handle having no
   // primary display.
   if (primary_display_id == display::Display::kInvalidDisplayID)
     return;
 
   ProcessDisplayChanged(*display_list()->FindDisplayById(primary_display_id),
                         true);
 }
 
 }  // namespace views