mash: Convert ShelfWindowWatcher to wm common types

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 5658c3a2069fcc8bce42d277e9b5604d3031a05a..74499cb9644ca858498156f854306f469e7d7688 100644
--- a/ash/shelf/shelf_window_watcher_item_delegate.h
+++ b/ash/shelf/shelf_window_watcher_item_delegate.h
@@ -6,19 +6,16 @@
 #define ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
 
 #include "ash/common/shelf/shelf_item_delegate.h"
-#include "base/compiler_specific.h"
 #include "base/macros.h"
 
-namespace aura {
-class Window;
-}
-
 namespace ash {
 
+class WmWindow;
+
 // ShelfItemDelegate for the items created by ShelfWindowWatcher.
 class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
  public:
-  explicit ShelfWindowWatcherItemDelegate(aura::Window* window);
+  explicit ShelfWindowWatcherItemDelegate(WmWindow* window);
   ~ShelfWindowWatcherItemDelegate() override;
 
  private:
@@ -32,8 +29,8 @@ class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
   bool ShouldShowTooltip() override;
   void Close() override;
 
-  // Stores a Window associated with this item. Not owned.
-  aura::Window* window_;
+  // The window associated with this item. Not owned.
+  WmWindow* window_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherItemDelegate);
 };