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

Unified Diff: ash/aura/shell_port_classic.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/aura/shell_port_classic.h ('k') | ash/mus/bridge/shell_port_mash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/shell_port_classic.cc
diff --git a/ash/aura/shell_port_classic.cc b/ash/aura/shell_port_classic.cc
index e1b66fa0e172750e0851beb2afd0dc1c8657b75b..d27eb274115b0f62dfa8155a33bb3d6bdbf7c0c8 100644
--- a/ash/aura/shell_port_classic.cc
+++ b/ash/aura/shell_port_classic.cc
@@ -112,11 +112,11 @@ bool ShellPortClassic::IsInUnifiedModeIgnoreMirroring() const {
display::DisplayManager::UNIFIED;
}
-void ShellPortClassic::SetDisplayWorkAreaInsets(WmWindow* window,
+void ShellPortClassic::SetDisplayWorkAreaInsets(aura::Window* window,
const gfx::Insets& insets) {
Shell::Get()
->window_tree_host_manager()
- ->UpdateWorkAreaOfDisplayNearestWindow(window->aura_window(), insets);
+ ->UpdateWorkAreaOfDisplayNearestWindow(window, insets);
}
std::unique_ptr<display::TouchTransformSetter>
@@ -191,7 +191,7 @@ ShellPortClassic::CreateTabletModeEventHandler() {
}
std::unique_ptr<WorkspaceEventHandler>
-ShellPortClassic::CreateWorkspaceEventHandler(WmWindow* workspace_window) {
+ShellPortClassic::CreateWorkspaceEventHandler(aura::Window* workspace_window) {
return base::MakeUnique<WorkspaceEventHandlerAura>(workspace_window);
}
« no previous file with comments | « ash/aura/shell_port_classic.h ('k') | ash/mus/bridge/shell_port_mash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698