| Index: ash/mus/move_event_handler.cc
|
| diff --git a/ash/mus/move_event_handler.cc b/ash/mus/move_event_handler.cc
|
| index dbda4d222f14fa2118d95135b2c63348016a3cff..6a4c17349c9008fddb93dc2b314ca59e37b88db5 100644
|
| --- a/ash/mus/move_event_handler.cc
|
| +++ b/ash/mus/move_event_handler.cc
|
| @@ -4,7 +4,7 @@
|
|
|
| #include "ash/mus/move_event_handler.h"
|
|
|
| -#include "ash/aura/wm_window_aura.h"
|
| +#include "ash/common/wm_window.h"
|
| #include "ash/mus/bridge/workspace_event_handler_mus.h"
|
| #include "services/ui/public/interfaces/cursor.mojom.h"
|
| #include "ui/aura/mus/window_manager_delegate.h"
|
| @@ -62,7 +62,7 @@ void OnMoveLoopCompleted(const base::Callback<void(bool success)>& end_closure,
|
| MoveEventHandler::MoveEventHandler(
|
| aura::WindowManagerClient* window_manager_client,
|
| aura::Window* window)
|
| - : wm_window_(ash::WmWindowAura::Get(window)),
|
| + : wm_window_(WmWindow::Get(window)),
|
| window_manager_client_(window_manager_client),
|
| toplevel_window_event_handler_(wm_window_->GetShell()) {
|
| window->AddObserver(this);
|
| @@ -77,8 +77,7 @@ MoveEventHandler::~MoveEventHandler() {
|
|
|
| // static
|
| MoveEventHandler* MoveEventHandler::GetForWindow(WmWindow* wm_window) {
|
| - return ash::WmWindowAura::GetAuraWindow(wm_window)->GetProperty(
|
| - kWmMoveEventHandler);
|
| + return WmWindow::GetAuraWindow(wm_window)->GetProperty(kWmMoveEventHandler);
|
| }
|
|
|
| void MoveEventHandler::AttemptToStartDrag(
|
|
|