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

ash/shelf/shelf_widget.h

Index: ash/shelf/shelf_widget.h
diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h
index 9a6353fef7d2b6870f6a657678020ae0756ccdde..64e1c5ee572bb35e27939f82c8f8eb4e9e977e07 100644
--- a/ash/shelf/shelf_widget.h
+++ b/ash/shelf/shelf_widget.h
@@ -28,7 +28,6 @@ class Shelf;
 class ShelfLayoutManager;
 class ShelfView;
 class StatusAreaWidget;
-class WmWindow;
 
 // The ShelfWidget manages the shelf view (which contains the shelf icons) and
 // the status area widget. There is one ShelfWidget per display. It is created
@@ -38,10 +37,10 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
                                public ShelfBackgroundAnimatorObserver,
                                public ShelfLayoutManagerObserver {
  public:
-  ShelfWidget(WmWindow* shelf_container, Shelf* shelf);
+  ShelfWidget(aura::Window* shelf_container, Shelf* shelf);
   ~ShelfWidget() override;
 
-  void CreateStatusAreaWidget(WmWindow* status_container);
+  void CreateStatusAreaWidget(aura::Window* status_container);
 
   void OnShelfAlignmentChanged();
 
@@ -76,10 +75,10 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
   void Shutdown();
 
   // See Shelf::UpdateIconPositionForPanel().
-  void UpdateIconPositionForPanel(WmWindow* panel);
+  void UpdateIconPositionForPanel(aura::Window* panel);
 
   // See Shelf::GetScreenBoundsOfItemIconForWindow().
-  gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window);
+  gfx::Rect GetScreenBoundsOfItemIconForWindow(aura::Window* window);
 
   // Returns the button that opens the app launcher.
   AppListButton* GetAppListButton() const;