[mus+ash] Removes WmWindow from ash/shelf and ash/shell

ash/shelf/shelf.h

Index: ash/shelf/shelf.h
diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
index af21bc46767b898b04cd986f14720da213d0bb4c..9467a37253d3e58d5f96a129dbeb9f17fc686e29 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -36,7 +36,6 @@ class ShelfView;
 class ShelfWidget;
 class StatusAreaWidget;
 class ShelfObserver;
-class WmWindow;
 
 // Controller for the shelf state. One per display, because each display might
 // have different shelf alignment, autohide, etc. Exists for the lifetime of the
@@ -54,7 +53,7 @@ class ASH_EXPORT Shelf : public ShelfLayoutManagerObserver {
   // adjust the alignment (eg. not allowed in guest and supervised user modes).
   static bool CanChangeShelfAlignment();
 
-  void CreateShelfWidget(WmWindow* root);
+  void CreateShelfWidget(aura::Window* root);
   void ShutdownShelfWidget();
   void DestroyShelfWidget();
 
@@ -68,7 +67,7 @@ class ASH_EXPORT Shelf : public ShelfLayoutManagerObserver {
   void NotifyShelfInitialized();
 
   // Returns the window showing the shelf.
-  WmWindow* GetWindow();
+  aura::Window* GetWindow();
 
   ShelfAlignment alignment() const { return alignment_; }
   void SetAlignment(ShelfAlignment alignment);
@@ -106,11 +105,11 @@ class ASH_EXPORT Shelf : public ShelfLayoutManagerObserver {
 
   // Updates the icon position given the current window bounds. This is used
   // when dragging panels to reposition them with respect to the other panels.
-  void UpdateIconPositionForPanel(WmWindow* window);
+  void UpdateIconPositionForPanel(aura::Window* window);
 
   // Returns the screen bounds of the item for the specified window. If there is
   // no item for the specified window an empty rect is returned.
-  gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window);
+  gfx::Rect GetScreenBoundsOfItemIconForWindow(aura::Window* window);
 
   // Launch a 0-indexed shelf item in the shelf. A negative index launches the
   // last shelf item in the shelf.