| Index: ash/wm/workspace_controller.h
|
| diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
|
| index 22bf5bb3cb0a27e3749898726c9d8e4cbcbab587..16c2ff7fc87b60535fc858501c120e89cdf78541 100644
|
| --- a/ash/wm/workspace_controller.h
|
| +++ b/ash/wm/workspace_controller.h
|
| @@ -13,7 +13,6 @@
|
| #include "ui/aura/window_observer.h"
|
|
|
| namespace ash {
|
| -class WmWindow;
|
| class WorkspaceControllerTestHelper;
|
| class WorkspaceEventHandler;
|
| class WorkspaceLayoutManager;
|
| @@ -24,7 +23,7 @@ class WorkspaceLayoutManagerBackdropDelegate;
|
| class ASH_EXPORT WorkspaceController : public aura::WindowObserver {
|
| public:
|
| // Installs WorkspaceLayoutManager on |viewport|.
|
| - explicit WorkspaceController(WmWindow* viewport);
|
| + explicit WorkspaceController(aura::Window* viewport);
|
| ~WorkspaceController() override;
|
|
|
| // Returns the current window state.
|
| @@ -46,7 +45,7 @@ class ASH_EXPORT WorkspaceController : public aura::WindowObserver {
|
| // aura::WindowObserver:
|
| void OnWindowDestroying(aura::Window* window) override;
|
|
|
| - WmWindow* viewport_;
|
| + aura::Window* viewport_;
|
| std::unique_ptr<WorkspaceEventHandler> event_handler_;
|
|
|
| // Owned by |viewport_|.
|
|
|