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

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

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.cc ('k') | ash/mus/bridge/shell_port_mash.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.h
diff --git a/ash/mus/bridge/shell_port_mash.h b/ash/mus/bridge/shell_port_mash.h
index 2624227b90bccf11525cbf5fb66b773b8d1af4cd..3470f5064dd113156bfd0d6829b9ee370d71c048 100644
--- a/ash/mus/bridge/shell_port_mash.h
+++ b/ash/mus/bridge/shell_port_mash.h
@@ -70,7 +70,7 @@ class ShellPortMash : public ShellPort, public WindowTreeHostManager::Observer {
display::Display GetFirstDisplay() const override;
bool IsInUnifiedMode() const override;
bool IsInUnifiedModeIgnoreMirroring() const override;
- void SetDisplayWorkAreaInsets(WmWindow* window,
+ void SetDisplayWorkAreaInsets(aura::Window* window,
const gfx::Insets& insets) override;
std::unique_ptr<display::TouchTransformSetter> CreateTouchTransformDelegate()
override;
@@ -92,7 +92,7 @@ class ShellPortMash : public ShellPort, public WindowTreeHostManager::Observer {
std::unique_ptr<wm::TabletModeEventHandler> CreateTabletModeEventHandler()
override;
std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler(
- WmWindow* workspace_window) override;
+ aura::Window* workspace_window) override;
std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
CreateScopedDisableInternalMouseAndKeyboard() override;
std::unique_ptr<ImmersiveFullscreenController>
« no previous file with comments | « ash/aura/shell_port_classic.cc ('k') | ash/mus/bridge/shell_port_mash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698