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

ash/autoclick/autoclick_controller.cc

 // Copyright 2013 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/autoclick/autoclick_controller.h"
 
 #include "ash/autoclick/common/autoclick_controller_common.h"
 #include "ash/autoclick/common/autoclick_controller_common_delegate.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 "base/timer/timer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/event.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/event_sink.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
@@ skipping 108 matching lines @@
 void AutoclickControllerImpl::OnGestureEvent(ui::GestureEvent* event) {
   autoclick_controller_common_->CancelAutoclick();
 }
 
 void AutoclickControllerImpl::OnScrollEvent(ui::ScrollEvent* event) {
   autoclick_controller_common_->CancelAutoclick();
 }
 
 views::Widget* AutoclickControllerImpl::CreateAutoclickRingWidget(
     const gfx::Point& event_location) {
-  aura::Window* target =
-      WmWindow::GetAuraWindow(ash::wm::GetRootWindowAt(event_location));
+  aura::Window* target = ash::wm::GetRootWindowAt(event_location);
   SetTapDownTarget(target);
   aura::Window* root_window = target->GetRootWindow();
   widget_.reset(new views::Widget);
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
   params.accept_events = false;
   params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.context = root_window;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.parent =
       Shell::GetContainer(root_window, kShellWindowId_OverlayContainer);
   widget_->Init(params);
   widget_->SetOpacity(1.f);
   return widget_.get();
 }
 
 void AutoclickControllerImpl::UpdateAutoclickRingWidget(
     views::Widget* widget,
     const gfx::Point& event_location) {
-  aura::Window* target =
-      WmWindow::GetAuraWindow(ash::wm::GetRootWindowAt(event_location));
+  aura::Window* target = ash::wm::GetRootWindowAt(event_location);
   SetTapDownTarget(target);
   aura::Window* root_window = target->GetRootWindow();
   if (widget->GetNativeView()->GetRootWindow() != root_window) {
     views::Widget::ReparentNativeView(
         widget->GetNativeView(),
         Shell::GetContainer(root_window, kShellWindowId_OverlayContainer));
   }
 }
 
 void AutoclickControllerImpl::DoAutoclick(const gfx::Point& event_location,
                                           const int mouse_event_flags) {
-  aura::Window* root_window =
-      WmWindow::GetAuraWindow(wm::GetRootWindowAt(event_location));
+  aura::Window* root_window = wm::GetRootWindowAt(event_location);
   DCHECK(root_window) << "Root window not found while attempting autoclick.";
 
   gfx::Point click_location(event_location);
   ::wm::ConvertPointFromScreen(root_window, &click_location);
   aura::WindowTreeHost* host = root_window->GetHost();
   host->ConvertDIPToPixels(&click_location);
 
   ui::MouseEvent press_event(ui::ET_MOUSE_PRESSED, click_location,
                              click_location, ui::EventTimeForNow(),
                              mouse_event_flags | ui::EF_LEFT_MOUSE_BUTTON,
@@ skipping 19 matching lines @@
   DCHECK_EQ(tap_down_target_, window);
   autoclick_controller_common_->CancelAutoclick();
 }
 
 // static.
 AutoclickController* AutoclickController::CreateInstance() {
   return new AutoclickControllerImpl();
 }
 
 }  // namespace ash