chromeos: Converts WorkspaceLayoutManager to aura::LayoutManager

ash/wm/workspace/workspace_layout_manager.h

Index: ash/wm/workspace/workspace_layout_manager.h
diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h
index cfb2969bb413fe417fc0edc849ade9d56c1a2f09..6d0e6fea32941f13364269a322ad333a17d7e85c 100644
--- a/ash/wm/workspace/workspace_layout_manager.h
+++ b/ash/wm/workspace/workspace_layout_manager.h
@@ -12,9 +12,9 @@
 #include "ash/shell_observer.h"
 #include "ash/wm/window_state_observer.h"
 #include "ash/wm/wm_types.h"
-#include "ash/wm_layout_manager.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
+#include "ui/aura/layout_manager.h"
 #include "ui/aura/window_observer.h"
 #include "ui/display/display_observer.h"
 #include "ui/gfx/geometry/rect.h"
@@ -28,7 +28,6 @@ class KeyboardController;
 namespace ash {
 
 class RootWindowController;
-class WmWindow;
 class WorkspaceLayoutManagerBackdropDelegate;
 
 namespace wm {
@@ -37,7 +36,7 @@ class WMEvent;
 
 // LayoutManager used on the window created for a workspace.
 class ASH_EXPORT WorkspaceLayoutManager
-    : public WmLayoutManager,
+    : public aura::LayoutManager,
       public aura::WindowObserver,
       public aura::client::ActivationChangeObserver,
       public keyboard::KeyboardControllerObserver,
@@ -46,7 +45,7 @@ class ASH_EXPORT WorkspaceLayoutManager
       public wm::WindowStateObserver {
  public:
   // |window| is the container for this layout manager.
-  explicit WorkspaceLayoutManager(WmWindow* window);
+  explicit WorkspaceLayoutManager(aura::Window* window);
   ~WorkspaceLayoutManager() override;
 
   // A delegate which can be set to add a backdrop behind the top most visible
@@ -55,13 +54,14 @@ class ASH_EXPORT WorkspaceLayoutManager
   void SetMaximizeBackdropDelegate(
       std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate);
 
-  // Overridden from WmLayoutManager:
+  // Overridden from aura::LayoutManager:
   void OnWindowResized() override;
-  void OnWindowAddedToLayout(WmWindow* child) override;
-  void OnWillRemoveWindowFromLayout(WmWindow* child) override;
-  void OnWindowRemovedFromLayout(WmWindow* child) override;
-  void OnChildWindowVisibilityChanged(WmWindow* child, bool visibile) override;
-  void SetChildBounds(WmWindow* child,
+  void OnWindowAddedToLayout(aura::Window* child) override;
+  void OnWillRemoveWindowFromLayout(aura::Window* child) override;
+  void OnWindowRemovedFromLayout(aura::Window* child) override;
+  void OnChildWindowVisibilityChanged(aura::Window* child,
+                                      bool visibile) override;
+  void SetChildBounds(aura::Window* child,
                       const gfx::Rect& requested_bounds) override;
 
   // Overriden from aura::WindowObserver:
@@ -100,7 +100,7 @@ class ASH_EXPORT WorkspaceLayoutManager
                                      WmWindow* root_window) override;
 
  private:
-  typedef std::set<WmWindow*> WindowSet;
+  typedef std::set<aura::Window*> WindowSet;
 
   // Adjusts the bounds of all managed windows when the display area changes.
   // This happens when the display size, work area insets has changed.
@@ -120,10 +120,10 @@ class ASH_EXPORT WorkspaceLayoutManager
 
   // Updates the always-on-top state for windows managed by this layout
   // manager.
-  void UpdateAlwaysOnTop(WmWindow* window_on_top);
+  void UpdateAlwaysOnTop(aura::Window* window_on_top);
 
-  WmWindow* window_;
-  WmWindow* root_window_;
+  aura::Window* window_;
+  aura::Window* root_window_;
   RootWindowController* root_window_controller_;
 
   // Set of windows we're listening to.