[mus+ash] Removes WmWindow from ash/wm/overview and ash/wm/workspace

ash/shelf/shelf_window_watcher_item_delegate.h

Index: ash/shelf/shelf_window_watcher_item_delegate.h
diff --git a/ash/shelf/shelf_window_watcher_item_delegate.h b/ash/shelf/shelf_window_watcher_item_delegate.h
index 64e8af57a4cb8c45d9d1cd6325a4e770f4c52df5..00bbd6a2314162ee0439f328fa8dc2424045f3a2 100644
--- a/ash/shelf/shelf_window_watcher_item_delegate.h
+++ b/ash/shelf/shelf_window_watcher_item_delegate.h
@@ -8,15 +8,17 @@
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "base/macros.h"
 
-namespace ash {
+namespace aura {
+class Window;
+}
 
-class WmWindow;
+namespace ash {
 
 // ShelfItemDelegate for the items created by ShelfWindowWatcher, for example:
 // The Chrome OS settings window, task manager window, and panel windows.
 class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
  public:
-  ShelfWindowWatcherItemDelegate(const ShelfID& id, WmWindow* window);
+  ShelfWindowWatcherItemDelegate(const ShelfID& id, aura::Window* window);
   ~ShelfWindowWatcherItemDelegate() override;
 
  private:
@@ -29,7 +31,7 @@ class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
   void Close() override;
 
   // The window associated with this item. Not owned.
-  WmWindow* window_;
+  aura::Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherItemDelegate);
 };