Converts remaining usage of WmLayoutManager to aura::LayoutManager

ash/shell_port.h

 // Copyright 2016 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_SHELL_PORT_H_
 #define ASH_SHELL_PORT_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 102 matching lines @@
 
   // Sets work area insets of the display containing |window|, pings observers.
   virtual void SetDisplayWorkAreaInsets(WmWindow* window,
                                         const gfx::Insets& insets) = 0;
 
   // Returns true if a system-modal dialog window is currently open.
   bool IsSystemModalWindowOpen();
 
   // Creates a modal background (a partially-opaque fullscreen window) on all
   // displays for |window|.
-  void CreateModalBackground(WmWindow* window);
+  void CreateModalBackground(aura::Window* window);
 
   // Called when a modal window is removed. It will activate another modal
   // window if any, or remove modal screens on all displays.
-  void OnModalWindowRemoved(WmWindow* removed);
+  void OnModalWindowRemoved(aura::Window* removed);
 
   // For testing only: set simulation that a modal window is open
   void SimulateModalWindowOpenForTesting(bool modal_window_open) {
     simulate_modal_window_open_for_testing_ = modal_window_open;
   }
 
   // See aura::client::CursorClient for details on these.
   virtual void LockCursor() = 0;
   virtual void UnlockCursor() = 0;
   virtual bool IsMouseEventsEnabled() = 0;
@@ skipping 100 matching lines @@
   static ShellPort* instance_;
 
   base::ObserverList<LockStateObserver> lock_state_observers_;
 
   bool simulate_modal_window_open_for_testing_ = false;
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_PORT_H_