Converts remaining usage of WmLayoutManager to aura::LayoutManager

ash/wm_window.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_WM_WINDOW_H_
 #define ASH_WM_WINDOW_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 26 matching lines @@
 }
 
 namespace views {
 class View;
 }
 
 namespace ash {
 
 class ImmersiveFullscreenController;
 class RootWindowController;
-class WmLayoutManager;
 class WmTransientWindowObserver;
 class WmWindowTestApi;
 enum class WmWindowProperty;
 
 namespace wm {
 class WindowState;
 }
 
 // WmWindow abstracts away differences between ash running in classic mode
 // and ash running with aura-mus.
@@ skipping 122 matching lines @@
   WmWindow* GetTransientParent() {
     return const_cast<WmWindow*>(
         const_cast<const WmWindow*>(this)->GetTransientParent());
   }
   const WmWindow* GetTransientParent() const;
   std::vector<WmWindow*> GetTransientChildren();
 
   // Moves this to the display where |event| occurred; returns true if moved.
   bool MoveToEventRoot(const ui::Event& event);
 
-  void SetLayoutManager(std::unique_ptr<WmLayoutManager> layout_manager);
-  WmLayoutManager* GetLayoutManager();
-
   // See wm::SetWindowVisibilityChangesAnimated() for details on what this
   // does.
   void SetVisibilityChangesAnimated();
   // |type| is WindowVisibilityAnimationType. Has to be an int to match aura.
   void SetVisibilityAnimationType(int type);
   void SetVisibilityAnimationDuration(base::TimeDelta delta);
   void SetVisibilityAnimationTransition(
       ::wm::WindowVisibilityAnimationTransition transition);
   void Animate(::wm::WindowAnimationType type);
   void StopAnimatingProperty(
@@ skipping 158 matching lines @@
 
   // If true the minimum size is 0x0, default is minimum size comes from widget.
   bool use_empty_minimum_size_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(WmWindow);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_WINDOW_H_