chromeos: Converts WorkspaceLayoutManager to aura::LayoutManager

ash/wm/workspace/workspace_layout_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
 #define ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
 
 #include <memory>
 #include <set>
 
 #include "ash/ash_export.h"
 #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"
 #include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace keyboard {
 class KeyboardController;
 }
 
 namespace ash {
 
 class RootWindowController;
-class WmWindow;
 class WorkspaceLayoutManagerBackdropDelegate;
 
 namespace wm {
 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,
       public display::DisplayObserver,
       public ShellObserver,
       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
   // window. With the call the ownership of the delegate will be transferred to
   // the 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:
   void OnWindowHierarchyChanged(const HierarchyChangeParams& params) override;
   void OnWindowPropertyChanged(aura::Window* window,
                                const void* key,
                                intptr_t old) override;
   void OnWindowStackingChanged(aura::Window* window) override;
   void OnWindowDestroying(aura::Window* window) override;
   void OnWindowBoundsChanged(aura::Window* window,
@@ skipping 18 matching lines @@
                                uint32_t changed_metrics) override;
 
   // ShellObserver overrides:
   void OnFullscreenStateChanged(bool is_fullscreen,
                                 WmWindow* root_window) override;
   void OnPinnedStateChanged(WmWindow* pinned_window) override;
   void OnVirtualKeyboardStateChanged(bool activated,
                                      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.
   // If this is called for a display size change (i.e. |event|
   // is DISPLAY_RESIZED), the non-maximized/non-fullscreen
   // windows are readjusted to make sure the window is completely within the
   // display region. Otherwise, it makes sure at least some parts of the window
   // is on display.
   void AdjustAllWindowsBoundsForWorkAreaChange(const wm::WMEvent* event);
 
   // Updates the visibility state of the shelf.
   void UpdateShelfVisibility();
 
   // Updates the fullscreen state of the workspace and notifies Shell if it
   // has changed.
   void UpdateFullscreenState();
 
   // 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.
   WindowSet windows_;
 
   // The work area in the coordinates of |window_|.
   gfx::Rect work_area_in_parent_;
 
   // True if this workspace is currently in fullscreen mode.
   bool is_fullscreen_;
 
   // A window which covers the full container and which gets inserted behind the
   // topmost visible window.
   std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> backdrop_delegate_;
 
   ScopedObserver<keyboard::KeyboardController,
                  keyboard::KeyboardControllerObserver>
       keyboard_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_