mash: Migrate shelf menus to wm common types

ash/shelf/shelf.h

Index: ash/shelf/shelf.h
diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
index adecec1a1248879401900f47397d4d50a1ac1611..66c23b266464fd67eda3d362e7b2b7c55a6daf54 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -40,6 +40,7 @@ class ShelfDelegate;
 class ShelfIconObserver;
 class ShelfModel;
 class ShelfView;
+class WmShelf;
 
 namespace test {
 class ShelfTestAPI;
@@ -51,7 +52,10 @@ class ASH_EXPORT Shelf {
  public:
   static const char kNativeViewName[];
 
-  Shelf(ShelfModel* model, ShelfDelegate* delegate, ShelfWidget* widget);
+  Shelf(ShelfModel* model,
+        ShelfDelegate* delegate,
+        WmShelf* wm_shelf,
+        ShelfWidget* widget);
   virtual ~Shelf();
 
   // Return the shelf for the primary display. NULL if no user is logged in yet.
@@ -156,6 +160,8 @@ class ASH_EXPORT Shelf {
   friend class test::ShelfTestAPI;
 
   ShelfDelegate* delegate_;
+  // The shelf controller. Owned by the root window controller.
+  WmShelf* wm_shelf_;
   ShelfWidget* shelf_widget_;
   ShelfView* shelf_view_;
   ShelfLockingManager shelf_locking_manager_;