Index: ash/mus/bridge/shell_port_mash.cc |
diff --git a/ash/mus/bridge/shell_port_mash.cc b/ash/mus/bridge/shell_port_mash.cc |
index 61c964633d1219e855f00b432ed5d6a415dc0e67..89283e93ef47b8d44ea6a59291ff906333c68b0d 100644 |
--- a/ash/mus/bridge/shell_port_mash.cc |
+++ b/ash/mus/bridge/shell_port_mash.cc |
@@ -258,15 +258,15 @@ bool ShellPortMash::IsInUnifiedModeIgnoreMirroring() const { |
return false; |
} |
-void ShellPortMash::SetDisplayWorkAreaInsets(WmWindow* window, |
+void ShellPortMash::SetDisplayWorkAreaInsets(aura::Window* window, |
const gfx::Insets& insets) { |
if (GetAshConfig() == Config::MUS) { |
Shell::Get() |
->window_tree_host_manager() |
- ->UpdateWorkAreaOfDisplayNearestWindow(window->aura_window(), insets); |
+ ->UpdateWorkAreaOfDisplayNearestWindow(window, insets); |
return; |
} |
- window_manager_->screen()->SetWorkAreaInsets(window->aura_window(), insets); |
+ window_manager_->screen()->SetWorkAreaInsets(window, insets); |
} |
std::unique_ptr<display::TouchTransformSetter> |
@@ -398,12 +398,11 @@ ShellPortMash::CreateScopedDisableInternalMouseAndKeyboard() { |
} |
std::unique_ptr<WorkspaceEventHandler> |
-ShellPortMash::CreateWorkspaceEventHandler(WmWindow* workspace_window) { |
+ShellPortMash::CreateWorkspaceEventHandler(aura::Window* workspace_window) { |
if (GetAshConfig() == Config::MUS) |
return base::MakeUnique<WorkspaceEventHandlerAura>(workspace_window); |
- return base::MakeUnique<WorkspaceEventHandlerMus>( |
- WmWindow::GetAuraWindow(workspace_window)); |
+ return base::MakeUnique<WorkspaceEventHandlerMus>(workspace_window); |
} |
std::unique_ptr<ImmersiveFullscreenController> |