chromeos: Converts WorkspaceLayoutManager to aura::LayoutManager

ash/wm/workspace_controller.h

Index: ash/wm/workspace_controller.h
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
index 22bf5bb3cb0a27e3749898726c9d8e4cbcbab587..a4d93fdc47f1405cef07e5ad8df39ee5b35591c4 100644
--- a/ash/wm/workspace_controller.h
+++ b/ash/wm/workspace_controller.h
@@ -10,10 +10,10 @@
 #include "ash/ash_export.h"
 #include "ash/wm/workspace/workspace_types.h"
 #include "base/macros.h"
+#include "ui/aura/window.h"

[msw, 2017/05/05 23:48:06]

optional nit: forward declare instead? (or remove incl from cc)

[sky, 2017/05/08 15:16:37]

Done.

 #include "ui/aura/window_observer.h"
 
 namespace ash {
-class WmWindow;
 class WorkspaceControllerTestHelper;
 class WorkspaceEventHandler;
 class WorkspaceLayoutManager;
@@ -24,7 +24,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 +46,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_|.