Changes ScreenMusDelegate::GetWindowAtScreenPoint to return aura::Window

ui/views/mus/window_manager_connection.cc

 // Copyright 2015 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.
 
 #include "ui/views/mus/window_manager_connection.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 53 matching lines @@
         if (child)
           return child;
       }
 
       return window;
     }
   }
   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() {
   // ~WindowTreeClient calls back to us (we're its delegate), destroy it while
   // we are still valid.
   client_.reset();
   ui::OSExchangeDataProviderFactory::SetFactory(nullptr);
   ui::Clipboard::DestroyClipboardForCurrentThread();
   gpu_service_.reset();
   lazy_tls_ptr.Pointer()->Set(nullptr);
@@ skipping 80 matching lines @@
   ui::Clipboard::SetClipboardForCurrentThread(std::move(clipboard));
 
   ui::OSExchangeDataProviderFactory::SetFactory(this);
 
   ViewsDelegate::GetInstance()->set_native_widget_factory(base::Bind(
       &WindowManagerConnection::CreateNativeWidgetMus,
       base::Unretained(this),
       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) {
   DCHECK_EQ(client, client_.get());
   client_.reset();
 }
 
 void WindowManagerConnection::OnEmbedRootDestroyed(ui::Window* root) {
   // Not called for WindowManagerConnection as WindowTreeClient isn't created by
   // way of an Embed().
   NOTREACHED();
 }
 
 void WindowManagerConnection::OnPointerEventObserved(
     const ui::PointerEvent& event,
     ui::Window* target) {
   pointer_watcher_event_router_->OnPointerEventObserved(event, target);
 }
 
 void WindowManagerConnection::OnWindowManagerFrameValuesChanged() {
   if (client_)
     NativeWidgetMus::NotifyFrameChanged(client_.get());
 }
 
 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>
 WindowManagerConnection::BuildProvider() {
   return base::MakeUnique<aura::OSExchangeDataProviderMus>();
 }
 
 }  // namespace views