[mus+ash] Removes WmWindow from ash/wm/screen_pinning_controller.h

ash/wm/screen_pinning_controller.h

Index: ash/wm/screen_pinning_controller.h
diff --git a/ash/wm/screen_pinning_controller.h b/ash/wm/screen_pinning_controller.h
index 2bb3699e472440257d81cc465e5ac305e7a433ab..7b10ea3a58e78d5e5416304f1e4c20f33fb42e13 100644
--- a/ash/wm/screen_pinning_controller.h
+++ b/ash/wm/screen_pinning_controller.h
@@ -19,7 +19,6 @@ class Window;
 namespace ash {
 
 class WindowDimmer;
-class WmWindow;
 
 template <typename UserData>
 class WindowUserData;
@@ -38,34 +37,34 @@ class ASH_EXPORT ScreenPinningController : public WmDisplayObserver {
 
   // Sets a pinned window. It is not allowed to call this when there already
   // is a pinned window.
-  void SetPinnedWindow(WmWindow* pinned_window);
+  void SetPinnedWindow(aura::Window* pinned_window);
 
   // Returns true if in pinned mode, otherwise false.
   bool IsPinned() const;
 
   // Returns the pinned window if in pinned mode, or nullptr.
-  WmWindow* pinned_window() const { return pinned_window_; }
+  aura::Window* pinned_window() const { return pinned_window_; }
 
   // Called when a new window is added to the container which has the pinned
   // window.
-  void OnWindowAddedToPinnedContainer(WmWindow* new_window);
+  void OnWindowAddedToPinnedContainer(aura::Window* new_window);
 
   // Called when a window will be removed from the container which has the
   // pinned window.
-  void OnWillRemoveWindowFromPinnedContainer(WmWindow* window);
+  void OnWillRemoveWindowFromPinnedContainer(aura::Window* window);
 
   // Called when a window stacking is changed in the container which has the
   // pinned window.
-  void OnPinnedContainerWindowStackingChanged(WmWindow* window);
+  void OnPinnedContainerWindowStackingChanged(aura::Window* window);
 
   // Called when a new window is added to a system modal container.
-  void OnWindowAddedToSystemModalContainer(WmWindow* new_window);
+  void OnWindowAddedToSystemModalContainer(aura::Window* new_window);
 
   // Called when a window will be removed from a system modal container.
-  void OnWillRemoveWindowFromSystemModalContainer(WmWindow* window);
+  void OnWillRemoveWindowFromSystemModalContainer(aura::Window* window);
 
   // Called when a window stacking is changed in a system modal container.
-  void OnSystemModalContainerWindowStackingChanged(WmWindow* window);
+  void OnSystemModalContainerWindowStackingChanged(aura::Window* window);
 
  private:
   class PinnedContainerWindowObserver;
@@ -81,13 +80,13 @@ class ASH_EXPORT ScreenPinningController : public WmDisplayObserver {
 
   // Creates a WindowDimmer for |container| and places it in |window_dimmers_|.
   // Returns the window from WindowDimmer.
-  WmWindow* CreateWindowDimmer(WmWindow* container);
+  aura::Window* CreateWindowDimmer(aura::Window* container);
 
   // WmDisplayObserver:
   void OnDisplayConfigurationChanged() override;
 
   // Pinned window should be on top in the parent window.
-  WmWindow* pinned_window_ = nullptr;
+  aura::Window* pinned_window_ = nullptr;
 
   // Owns the WindowDimmers. There is one WindowDimmer for the parent of
   // |pinned_window_| and one for each display other than the display