mash: Remove ShelfDelegate; move functions to ShelfModel.

ash/shelf/shelf_view.h

 // Copyright (c) 2012 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.
 
 #ifndef ASH_SHELF_SHELF_VIEW_H_
 #define ASH_SHELF_SHELF_VIEW_H_
 
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 26 matching lines @@
 class MenuRunner;
 }
 
 namespace ash {
 class AppListButton;
 class DragImageView;
 class OverflowBubble;
 class OverflowButton;
 class ScopedRootWindowForNewWindows;
 class ShelfButton;
-class ShelfDelegate;
 class ShelfModel;
 struct ShelfItem;
 class ShelfWidget;
 class WmShelf;
 
 namespace test {
 class ShelfViewTestAPI;
 }
 
 enum ShelfAlignmentUmaEnumValue {
   SHELF_ALIGNMENT_UMA_ENUM_VALUE_BOTTOM,
   SHELF_ALIGNMENT_UMA_ENUM_VALUE_LEFT,
   SHELF_ALIGNMENT_UMA_ENUM_VALUE_RIGHT,
   // Must be last entry in enum.
   SHELF_ALIGNMENT_UMA_ENUM_VALUE_COUNT,
 };
 
 class ASH_EXPORT ShelfView : public views::View,
                              public ShelfModelObserver,
                              public InkDropButtonListener,
                              public views::ContextMenuController,
                              public views::FocusTraversable,
                              public views::BoundsAnimatorObserver,
                              public app_list::ApplicationDragAndDropHost {
  public:
   ShelfView(ShelfModel* model,
-            ShelfDelegate* delegate,
             WmShelf* wm_shelf,
             ShelfWidget* shelf_widget);
   ~ShelfView() override;
 
   WmShelf* wm_shelf() const { return wm_shelf_; }
   ShelfModel* model() const { return model_; }
 
   void Init();
 
   void OnShelfAlignmentChanged();
@@ skipping 260 matching lines @@
   // Convenience accessor to model_->items().
   const ShelfItem* ShelfItemForView(const views::View* view) const;
 
   // Get the distance from the given |coordinate| to the closest point on this
   // launcher/shelf.
   int CalculateShelfDistance(const gfx::Point& coordinate) const;
 
   // The model; owned by Launcher.
   ShelfModel* model_;
 
-  // Delegate; owned by Launcher.
-  ShelfDelegate* delegate_;
-
   // The shelf controller; owned by RootWindowController.
   WmShelf* wm_shelf_;
 
   // The shelf widget for this view. For overflow bubbles, this is the widget
   // for the shelf, not for the bubble.
   ShelfWidget* shelf_widget_;
 
   // Used to manage the set of active launcher buttons. There is a view per
   // item in |model_|.
   std::unique_ptr<views::ViewModel> view_model_;
@@ skipping 103 matching lines @@
   ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
 
   base::WeakPtrFactory<ShelfView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_VIEW_H_