[mus+ash] Removes WmWindow from ash/wm/root_window_finder.h

ash/wm/root_window_finder.cc

Index: ash/wm/root_window_finder.cc
diff --git a/ash/wm/root_window_finder.cc b/ash/wm/root_window_finder.cc
index 9d0b0c74adecfb7a396cf0b4b3c7c74b7a0a0093..cdb9ae7ac11786753ca529626566b43acf963f2c 100644
--- a/ash/wm/root_window_finder.cc
+++ b/ash/wm/root_window_finder.cc
@@ -6,7 +6,7 @@
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
-#include "ash/wm_window.h"
+#include "ui/aura/window.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/point.h"
@@ -15,21 +15,23 @@
 namespace ash {
 namespace wm {
 
-WmWindow* GetRootWindowAt(const gfx::Point& point) {
+aura::Window* GetRootWindowAt(const gfx::Point& point) {
   const display::Display& display =
       display::Screen::GetScreen()->GetDisplayNearestPoint(point);
   DCHECK(display.is_valid());
   RootWindowController* root_window_controller =
       Shell::GetRootWindowControllerWithDisplayId(display.id());
-  return root_window_controller ? root_window_controller->GetWindow() : nullptr;
+  return root_window_controller ? root_window_controller->GetRootWindow()
+                                : nullptr;
 }
 
-WmWindow* GetRootWindowMatching(const gfx::Rect& rect) {
+aura::Window* GetRootWindowMatching(const gfx::Rect& rect) {
   const display::Display& display =
       display::Screen::GetScreen()->GetDisplayMatching(rect);
   RootWindowController* root_window_controller =
       Shell::GetRootWindowControllerWithDisplayId(display.id());
-  return root_window_controller ? root_window_controller->GetWindow() : nullptr;
+  return root_window_controller ? root_window_controller->GetRootWindow()
+                                : nullptr;
 }
 
 }  // namespace wm