mash: Fold ShelfItemDelegateManager into 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 29 matching lines @@
 namespace ash {
 class AppListButton;
 class DragImageView;
 class OverflowBubble;
 class OverflowButton;
 class ScopedTargetRootWindow;
 class Shelf;
 class ShelfButton;
 class ShelfDelegate;
 class ShelfIconObserver;
 class ShelfItemDelegateManager;

[msw, 2016/07/21 21:30:53]

nit: remove (and do a 'git gs' to find others?)

[James Cook, 2016/07/22 01:20:08]

Done here and everywhere.

 class ShelfModel;
 struct ShelfItem;
 class WmShelf;
 
 namespace test {
 class ShelfViewTestAPI;
 }
 
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_BOTTOM;
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_LEFT;
@@ skipping 220 matching lines @@
       const ViewHierarchyChangedDetails& details) override;
 
   // Overridden from ui::EventHandler:
   void OnGestureEvent(ui::GestureEvent* event) override;
 
   // Overridden from ShelfModelObserver:
   void ShelfItemAdded(int model_index) override;
   void ShelfItemRemoved(int model_index, ShelfID id) override;
   void ShelfItemChanged(int model_index, const ShelfItem& old_item) override;
   void ShelfItemMoved(int start_index, int target_index) override;
+  void OnSetShelfItemDelegate(ShelfID id,
+                              ShelfItemDelegate* item_delegate) override;
 
   // Overridden from InkDropButtonListener:
   void ButtonPressed(views::Button* sender,
                      const ui::Event& event,
                      views::InkDrop* ink_drop) override;
 
   // Show a list of all running items for this shelf |item|; it only shows a
   // menu if there are multiple running items. |source| specifies the view
   // responsible for showing the menu, and the bubble will point towards it.
   // The |event_flags| are the flags of the event which triggered this menu.
@@ skipping 137 matching lines @@
 
   // The view which gets replaced by our drag icon proxy.
   views::View* drag_replaced_view_;
 
   // True when the icon was dragged off the shelf.
   bool dragged_off_shelf_;
 
   // The rip off view when a snap back operation is underway.
   views::View* snap_back_from_rip_off_view_;
 
-  // Holds ShelfItemDelegateManager.
-  ShelfItemDelegateManager* item_manager_;
-
   // True when this ShelfView is used for Overflow Bubble.
   bool overflow_mode_;
 
   // Holds a pointer to main ShelfView when a ShelfView is in overflow mode.
   ShelfView* main_shelf_;
 
   // True when ripped item from overflow bubble is entered into Shelf.
   bool dragged_off_from_overflow_to_shelf_;
 
   // True if the event is a repost event from a event which has just closed the
   // menu of the same shelf item.
   bool is_repost_event_on_same_item_;
 
   // Record the index for the last pressed shelf item. This variable is used to
   // check if a repost event occurs on the same shelf item as previous one. If
   // so, the repost event should be ignored.
   int last_pressed_index_;
 
   // Tracks UMA metrics based on shelf button press actions.
   ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_VIEW_H_