| Index: ash/shelf/shelf_view.h
|
| diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
|
| index c9a525e9e95237fa0ded421490f5271af90fbe18..6328de4dc75d3c590f4793eb37edd2acf2b40107 100644
|
| --- a/ash/shelf/shelf_view.h
|
| +++ b/ash/shelf/shelf_view.h
|
| @@ -35,16 +35,17 @@ class MenuRunner;
|
| }
|
|
|
| namespace ash {
|
| +class DragImageView;
|
| +class OverflowBubble;
|
| +class OverflowButton;
|
| class Shelf;
|
| +class ShelfButton;
|
| class ShelfDelegate;
|
| class ShelfIconObserver;
|
| class ShelfItemDelegateManager;
|
| class ShelfModel;
|
| struct ShelfItem;
|
| -class DragImageView;
|
| -class OverflowBubble;
|
| -class OverflowButton;
|
| -class ShelfButton;
|
| +class WmShelf;
|
|
|
| namespace test {
|
| class ShelfViewTestAPI;
|
| @@ -63,7 +64,10 @@ class ASH_EXPORT ShelfView : public views::View,
|
| public views::BoundsAnimatorObserver,
|
| public app_list::ApplicationDragAndDropHost {
|
| public:
|
| - ShelfView(ShelfModel* model, ShelfDelegate* delegate, Shelf* shelf);
|
| + ShelfView(ShelfModel* model,
|
| + ShelfDelegate* delegate,
|
| + WmShelf* wm_shelf,
|
| + Shelf* shelf);
|
| ~ShelfView() override;
|
|
|
| Shelf* shelf() const { return shelf_; }
|
| @@ -321,6 +325,9 @@ class ASH_EXPORT ShelfView : public views::View,
|
| // Delegate; owned by Launcher.
|
| ShelfDelegate* delegate_;
|
|
|
| + // The shelf controller; owned by RootWindowController.
|
| + WmShelf* wm_shelf_;
|
| +
|
| // The shelf; owned by ShelfWidget.
|
| Shelf* shelf_;
|
|
|
|
|