mash: Migrate shelf menus to wm common types

ash/shelf/shelf.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shelf/shelf.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/aura/wm_window_aura.h"
@@ skipping 26 matching lines @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 const char Shelf::kNativeViewName[] = "ShelfView";
 
 Shelf::Shelf(ShelfModel* shelf_model,
              ShelfDelegate* shelf_delegate,
+             WmShelf* wm_shelf,
              ShelfWidget* shelf_widget)
     : delegate_(shelf_delegate),
+      wm_shelf_(wm_shelf),
       shelf_widget_(shelf_widget),
-      shelf_view_(new ShelfView(shelf_model, delegate_, this)),
+      shelf_view_(new ShelfView(shelf_model, delegate_, wm_shelf, this)),
       shelf_locking_manager_(this) {
+  DCHECK(wm_shelf_);
   shelf_view_->Init();
   shelf_widget_->GetContentsView()->AddChildView(shelf_view_);
   shelf_widget_->GetNativeView()->SetName(kNativeViewName);
 }
 
 Shelf::~Shelf() {
   delegate_->OnShelfDestroyed(this);
 }
 
 // static
@@ skipping 161 matching lines @@
 
 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
   return shelf_view_->GetVisibleItemsBoundsInScreen();
 }
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 }  // namespace ash