| Index: ash/autoclick/autoclick_controller.cc
|
| diff --git a/ash/autoclick/autoclick_controller.cc b/ash/autoclick/autoclick_controller.cc
|
| index 7b45c064bbb902203b3136c8a1d5c7add8e9d3b7..85bf13ea12c68e1adadadacff4d286dd6e58d173 100644
|
| --- a/ash/autoclick/autoclick_controller.cc
|
| +++ b/ash/autoclick/autoclick_controller.cc
|
| @@ -4,10 +4,10 @@
|
|
|
| #include "ash/autoclick/autoclick_controller.h"
|
|
|
| -#include "ash/aura/wm_window_aura.h"
|
| #include "ash/autoclick/common/autoclick_controller_common.h"
|
| #include "ash/autoclick/common/autoclick_controller_common_delegate.h"
|
| #include "ash/common/wm/root_window_finder.h"
|
| +#include "ash/common/wm_window.h"
|
| #include "ash/public/cpp/shell_window_ids.h"
|
| #include "ash/shell.h"
|
| #include "base/timer/timer.h"
|
| @@ -139,7 +139,7 @@ void AutoclickControllerImpl::OnScrollEvent(ui::ScrollEvent* event) {
|
| views::Widget* AutoclickControllerImpl::CreateAutoclickRingWidget(
|
| const gfx::Point& event_location) {
|
| aura::Window* target =
|
| - WmWindowAura::GetAuraWindow(ash::wm::GetRootWindowAt(event_location));
|
| + WmWindow::GetAuraWindow(ash::wm::GetRootWindowAt(event_location));
|
| SetTapDownTarget(target);
|
| aura::Window* root_window = target->GetRootWindow();
|
| widget_.reset(new views::Widget);
|
| @@ -161,7 +161,7 @@ void AutoclickControllerImpl::UpdateAutoclickRingWidget(
|
| views::Widget* widget,
|
| const gfx::Point& event_location) {
|
| aura::Window* target =
|
| - WmWindowAura::GetAuraWindow(ash::wm::GetRootWindowAt(event_location));
|
| + WmWindow::GetAuraWindow(ash::wm::GetRootWindowAt(event_location));
|
| SetTapDownTarget(target);
|
| aura::Window* root_window = target->GetRootWindow();
|
| if (widget->GetNativeView()->GetRootWindow() != root_window) {
|
| @@ -174,7 +174,7 @@ void AutoclickControllerImpl::UpdateAutoclickRingWidget(
|
| void AutoclickControllerImpl::DoAutoclick(const gfx::Point& event_location,
|
| const int mouse_event_flags) {
|
| aura::Window* root_window =
|
| - WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(event_location));
|
| + WmWindow::GetAuraWindow(wm::GetRootWindowAt(event_location));
|
| DCHECK(root_window) << "Root window not found while attempting autoclick.";
|
|
|
| gfx::Point click_location(event_location);
|
|
|