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

ash/drag_drop/drag_drop_tracker.cc

 // Copyright (c) 2012 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 "ash/drag_drop/drag_drop_tracker.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/wm/root_window_finder.h"
-#include "ash/wm_window.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/public/activation_delegate.h"
 
 namespace ash {
 namespace {
@@ skipping 41 matching lines @@
 }
 
 void DragDropTracker::TakeCapture() {
   capture_window_->SetCapture();
 }
 
 aura::Window* DragDropTracker::GetTarget(const ui::LocatedEvent& event) {
   DCHECK(capture_window_.get());
   gfx::Point location_in_screen = event.location();
   ::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen);
-  aura::Window* root_window_at_point =
-      WmWindow::GetAuraWindow(wm::GetRootWindowAt(location_in_screen));
+  aura::Window* root_window_at_point = wm::GetRootWindowAt(location_in_screen);
   gfx::Point location_in_root = location_in_screen;
   ::wm::ConvertPointFromScreen(root_window_at_point, &location_in_root);
   return root_window_at_point->GetEventHandlerForPoint(location_in_root);
 }
 
 ui::LocatedEvent* DragDropTracker::ConvertEvent(aura::Window* target,
                                                 const ui::LocatedEvent& event) {
   DCHECK(capture_window_.get());
   gfx::Point target_location = event.location();
   aura::Window::ConvertPointToTarget(capture_window_.get(), target,
                                      &target_location);
   gfx::Point location_in_screen = event.location();
   ::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen);
   gfx::Point target_root_location = event.root_location();
-  aura::Window::ConvertPointToTarget(
-      capture_window_->GetRootWindow(),
-      WmWindow::GetAuraWindow(wm::GetRootWindowAt(location_in_screen)),
-      &target_root_location);
+  aura::Window::ConvertPointToTarget(capture_window_->GetRootWindow(),
+                                     wm::GetRootWindowAt(location_in_screen),
+                                     &target_root_location);
   return new ui::MouseEvent(
       event.type(), target_location, target_root_location,
       ui::EventTimeForNow(), event.flags(),
       static_cast<const ui::MouseEvent&>(event).changed_button_flags());
 }
 
 }  // namespace ash