Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1691)

Unified Diff: ash/mus/bridge/shell_port_mash.cc

Issue 2908793002: [mus+ash] Removes WmWindow from ash/wm/overview and ash/wm/workspace (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/bridge/shell_port_mash.h ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
« no previous file with comments | « ash/mus/bridge/shell_port_mash.h ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698